diff options
| -rw-r--r-- | app/models/chouette/stop_area.rb | 6 | 
1 files changed, 6 insertions, 0 deletions
| diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb index bb8747faa..a5573959b 100644 --- a/app/models/chouette/stop_area.rb +++ b/app/models/chouette/stop_area.rb @@ -113,7 +113,13 @@ module Chouette        end      end +<<<<<<< HEAD      alias_method :local_id, :user_objectid +======= +    def local_id +      id.to_s +    end +>>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas      def children_in_depth        return [] if self.children.empty? | 
