From de251bcf6d0f1db8858fa38ac14e108c1b9ea00f Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 10 Mar 2016 10:33:09 -0300
Subject: [PATCH] Fix conflicts

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

diff --git a/db/schema.rb b/db/schema.rb
index 1d4e18c5f95..082d681a176 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160308212903) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-- 
GitLab