Commit dfbb0d5b authored by Alexandre Friquet's avatar Alexandre Friquet

Removes remaining merge conflict.

parent c2fb96f7
......@@ -349,10 +349,7 @@ ActiveRecord::Schema.define(version: 20171211133706) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "platform_number"
<<<<<<< HEAD
=======
t.datetime "billed_at"
>>>>>>> master
end
create_table "websites", force: :cascade do |t|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment