1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index fb30ab69e..5058c95dc 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -148,6 +148,7 @@ module Chouette
         vjas.destroy
       end
     end
+<<<<<<< HEAD
 
     def control_route_sections
       stop_area_ids = self.stop_points.map(&:stop_area_id)
@@ -183,4 +184,8 @@ module Chouette
       end
     end
   end
-end
-\ No newline at end of file
+end
+=======
+  end
+end
+>>>>>>> master