diff options
| author | cedricnjanga | 2017-11-22 14:44:29 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-22 14:44:41 +0100 |
| commit | ffe835e4feb43796ea1a122aba8df087252fe2e5 (patch) | |
| tree | feb7d3d7a5b540e1102f8627e558b85b710bb1e9 /app/controllers/routes_controller.rb | |
| parent | f7b9b6ad5280179367c225e1d35d123bad67dcaf (diff) | |
| download | chouette-core-ffe835e4feb43796ea1a122aba8df087252fe2e5.tar.bz2 | |
Rebase master and resolve conflicts
Diffstat (limited to 'app/controllers/routes_controller.rb')
| -rw-r--r-- | app/controllers/routes_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb index c8813dbcb..1a6c82484 100644 --- a/app/controllers/routes_controller.rb +++ b/app/controllers/routes_controller.rb @@ -48,7 +48,7 @@ class RoutesController < ChouetteController @route_sp = ModelDecorator.decorate( @route_sp, - with: Chouette::StopPointDecorator + with: StopPointDecorator ) end end |