From 7c032665a81d9b81f6267d9bb133e8f0ec3b9e21 Mon Sep 17 00:00:00 2001
From: Guillaume
Date: Thu, 16 Nov 2017 15:38:39 +0100
Subject: Refs #4941 remove object_id_format_to_line_referential module,
 include just a object_id_format_to_referential module

---
 app/models/chouette/line.rb | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'app')

diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index d50395182..8d5ff5f60 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 module Chouette
   class Line < Chouette::ActiveRecord
     include LineRestrictions
@@ -6,16 +5,6 @@ module Chouette
     include ObjectidSupport
     extend StifTransportModeEnumerations
     extend StifTransportSubmodeEnumerations
-=======
-class Chouette::Line < Chouette::ActiveRecord
-  include StifCodifligneAttributesSupport
-  include LineRestrictions
-  include LineReferentialSupport
-  include ObjectIdFormat
-  extend StifTransportModeEnumerations
-  extend StifTransportSubmodeEnumerations
->>>>>>> add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941
-
     extend ActiveModel::Naming
 
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-- 
cgit v1.2.3