diff options
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" |