diff options
| author | Zog | 2018-01-24 07:28:57 +0100 |
|---|---|---|
| committer | cedricnjanga | 2018-02-07 07:24:32 -0800 |
| commit | 53009774ec18387a30689a25ae286ba76e0e15d8 (patch) | |
| tree | fb4dde7c67bfa4da06fc6a0ca311a4cc2a0aa340 /db | |
| parent | cb1c6c42cf0f053d52a08cb8ccdbb70a142ec5ad (diff) | |
| download | chouette-core-53009774ec18387a30689a25ae286ba76e0e15d8.tar.bz2 | |
Refs #5682; Add application_days field to calendars
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/db/schema.rb b/db/schema.rb index ec858a14a..43f989e38 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -796,10 +796,7 @@ ActiveRecord::Schema.define(version: 20180126134944) do t.string "stif_type" t.integer "waiting_time" t.string "kind" -<<<<<<< HEAD t.jsonb "localized_names" -======= ->>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas end add_index "stop_areas", ["name"], name: "index_stop_areas_on_name", using: :btree |