diff options
| author | Zog | 2018-01-24 07:28:57 +0100 |
|---|---|---|
| committer | cedricnjanga | 2018-02-06 11:06:08 -0800 |
| commit | 57d1749d53f0ad8fc26f67b42b2b207bf0ab06ad (patch) | |
| tree | 1254efe74696d76a2f612bdaca450304cb9efcd6 /db/schema.rb | |
| parent | a477a97347792540426aad79b1709dbb12aeb3c2 (diff) | |
| download | chouette-core-57d1749d53f0ad8fc26f67b42b2b207bf0ab06ad.tar.bz2 | |
Refs #5682; Add application_days field to calendars
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index 9be702fa3..614d9803e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,8 @@ # # It's strongly recommended that you check this file into your version control system. -<<<<<<< HEAD -ActiveRecord::Schema.define(version: 20180123174450) do -======= + ActiveRecord::Schema.define(version: 20180126134944) do ->>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |