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/models | |
| parent | f7b9b6ad5280179367c225e1d35d123bad67dcaf (diff) | |
| download | chouette-core-ffe835e4feb43796ea1a122aba8df087252fe2e5.tar.bz2 | |
Rebase master and resolve conflicts
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/stop_point.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb index 86be39d70..f4c9b3800 100644 --- a/app/models/chouette/stop_point.rb +++ b/app/models/chouette/stop_point.rb @@ -2,7 +2,7 @@ module Chouette class StopPoint < Chouette::TridentActiveRecord def self.policy_class - Chouette::RoutePolicy + RoutePolicy end include ForBoardingEnumerations |