Refs #5682; Add application_days field to calendars

3 files changed, 4 insertions, 4 deletions

diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 84b569ab4..50faa9bde 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -50,6 +50,7 @@ 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
 
@@ -87,6 +88,8 @@ 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/db/schema.rb b/db/schema.rb
index ec858a14a..43f989e38 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -796,10 +796,7 @@ ActiveRecord::Schema.define(version: 20180126134944) do
     t.string   "stif_type"
     t.integer  "waiting_time"
     t.string   "kind"
-<<<<<<< HEAD
     t.jsonb    "localized_names"
-=======
->>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas
   end
 
   add_index "stop_areas", ["name"], name: "index_stop_areas_on_name", using: :btree
diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb
index a501f234a..856188f58 100644
--- a/spec/models/chouette/time_table_spec.rb
+++ b/spec/models/chouette/time_table_spec.rb
@@ -926,7 +926,7 @@ end
       end
     end
   end
-
+  
   describe "#validity_out_between?" do
     let(:empty_tm) {build(:time_table)}
     it "should be false if empty calendar" do