diff options
| author | Zakaria BOUZIANE | 2015-04-28 14:44:29 +0200 | 
|---|---|---|
| committer | Zakaria BOUZIANE | 2015-04-28 14:44:29 +0200 | 
| commit | a01fca35dda9116c7ba667c1d5d4aca502eb44c0 (patch) | |
| tree | 891f1cddebb42a954825a72626ca0e75d0ea5cb5 /app/models/gtfs_export.rb | |
| parent | 25493ad2295ca41687fb9f08632585f22ce0b072 (diff) | |
| parent | 9b6492cea068f745fd4628635154b4875d3e74fd (diff) | |
| download | chouette-core-a01fca35dda9116c7ba667c1d5d4aca502eb44c0.tar.bz2 | |
ComplianceCheckTask to ComplianceCheck : fixing Conflicts
Diffstat (limited to 'app/models/gtfs_export.rb')
| -rw-r--r-- | app/models/gtfs_export.rb | 18 | 
1 files changed, 8 insertions, 10 deletions
diff --git a/app/models/gtfs_export.rb b/app/models/gtfs_export.rb index 279cc62d7..91b3fadc0 100644 --- a/app/models/gtfs_export.rb +++ b/app/models/gtfs_export.rb @@ -19,16 +19,14 @@ class GtfsExport < ExportTask    def action_params      { -      "parameters" => { -        "gtfs-export" => { -          "name" => name, -          "references_type" => references_type, -          "user_name" => user_name, -          "organisation_name" => organisation.name, -          "referential_name" => referential.name, -          "time_zone" => time_zone, -          "object_id_prefix" => object_id_prefix -        } +      "gtfs-export" => { +        "name" => name, +        "references_type" => references_type, +        "user_name" => user_name, +        "organisation_name" => organisation.name, +        "referential_name" => referential.name, +        "time_zone" => time_zone, +        "object_id_prefix" => object_id_prefix        }      }    end  | 
