From 57d1749d53f0ad8fc26f67b42b2b207bf0ab06ad Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 24 Jan 2018 07:28:57 +0100
Subject: Refs #5682; Add application_days field to calendars

---
 db/schema.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'db/schema.rb')

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"
-- 
cgit v1.2.3