From bc49350a4dfabedd03993f33c72b2cf10ea75d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20Keskk=C3=BCla?= <andres@gitlab.eu>
Date: Thu, 25 Sep 2014 15:42:11 +0300
Subject: [PATCH] Fixed db/schema merge mishap

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

diff --git a/db/schema.rb b/db/schema.rb
index 9132f3ed0..2c4d7b713 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20140925073734) do
-=======
 ActiveRecord::Schema.define(version: 20140925101927) do
->>>>>>> 662806d8c92f67dda55ee91326dfb5f89ddfc230
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"