Refs #5682 @3h; Use same UI as for timetables

2 files changed, 0 insertions, 6 deletions

diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 50faa9bde..84b569ab4 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -50,7 +50,6 @@ class Calendar < ActiveRecord::Base
         tt.periods << Chouette::TimeTablePeriod.new(period_start: p.begin, period_end: p.end)
       end
       tt.int_day_types = self.int_day_types
-<<<<<<< HEAD
     end
   end
 
@@ -88,8 +87,6 @@ class Calendar < ActiveRecord::Base
   def all_dates
     (dates + excluded_dates).sort.each_with_index.map do |d, i|
       OpenStruct.new(id: i, date: d, in_out: include_in_dates?(d))
-=======
->>>>>>> Refs #5682; Add application_days field to calendars
     end
   end
 
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 69aed144b..bb8747faa 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -11,11 +11,8 @@ module Chouette
     extend Enumerize
     enumerize :area_type, in: Chouette::AreaType::ALL
     enumerize :kind, in: %i(commercial non_commercial)
-<<<<<<< HEAD
 
     AVAILABLE_LOCALIZATIONS = %i(gb nl de fr it es)
-=======
->>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas
 
     with_options dependent: :destroy do |assoc|
       assoc.has_many :stop_points