updating db schema

Leandro Santos
2 parents 0e93a9eb f6358b74
Showing 1 changed file with 0 additions and 3 deletions Show diff stats
db/schema.rb
@@ -290,10 +290,7 @@ ActiveRecord::Schema.define(version: 20160422163123) do
     t.string   "referrer"
     t.text     "settings"
     t.integer  "paragraph_id"
-<<<<<<< HEAD
-=======
     t.string   "paragraph_uuid"
->>>>>>> master
   end
  
   add_index "comments", ["paragraph_uuid"], name: "index_comments_on_paragraph_uuid", using: :btree
...	...	@@ -290,10 +290,7 @@ ActiveRecord::Schema.define(version: 20160422163123) do
290	290	t.string "referrer"
291	291	t.text "settings"
292	292	t.integer "paragraph_id"
293		-<<<<<<< HEAD
294		-=======
295	293	t.string "paragraph_uuid"
296		->>>>>>> master
297	294	end
298	295
299	296	add_index "comments", ["paragraph_uuid"], name: "index_comments_on_paragraph_uuid", using: :btree
...	...