diff options
| author | Zakaria BOUZIANE | 2014-07-07 17:15:10 +0200 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-07-07 17:15:10 +0200 |
| commit | a77d67e7807f90ea24e96b5c1a9e6bbb290170b0 (patch) | |
| tree | 80b395a4a06b41369a3cf3eb006f98ea14ed7f22 /app/controllers/lines_controller.rb | |
| parent | 22c280f7042b554d8382b7d7511132efcd067ad6 (diff) | |
| parent | c5228e916b7b468a56c3c8a7441ac6973b875fff (diff) | |
| download | chouette-core-a77d67e7807f90ea24e96b5c1a9e6bbb290170b0.tar.bz2 | |
Merge branch 'tad_pmr' into sismo
Conflicts:
Gemfile
Gemfile.lock
db/schema.rb
Diffstat (limited to 'app/controllers/lines_controller.rb')
| -rw-r--r-- | app/controllers/lines_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb index effb0deba..6f717549a 100644 --- a/app/controllers/lines_controller.rb +++ b/app/controllers/lines_controller.rb @@ -17,7 +17,6 @@ class LinesController < ChouetteController end end - def show @map = LineMap.new(resource).with_helpers(self) @routes = @line.routes |