diff options
| author | cedricnjanga | 2018-02-07 07:46:38 -0800 |
|---|---|---|
| committer | cedricnjanga | 2018-02-07 07:46:38 -0800 |
| commit | 3334b12153f0d24a95b1198742fd0da2444223fe (patch) | |
| tree | e288b5b35ceb379ecd9f24091eea3638562ca3d5 /app | |
| parent | cd0b21446d2b56505917fa310c2e9b23e5819e49 (diff) | |
| download | chouette-core-3334b12153f0d24a95b1198742fd0da2444223fe.tar.bz2 | |
Update branch according to master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/chouette/stop_area.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb index a5573959b..bb8747faa 100644 --- a/app/models/chouette/stop_area.rb +++ b/app/models/chouette/stop_area.rb @@ -113,13 +113,7 @@ 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? |