fixed db/schema

87f555e1 · Dmitriy Zaporozhets · 5c3cb47c · 87f555e1
Commit 87f555e1 authored Mar 01, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

schema.rb db/schema.rb +0 -5

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -233,14 +233,9 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
    t.string   "name"
    t.string   "path"
    t.integer  "owner_id"
-<<<<<<< HEAD
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-=======
    t.datetime "created_at",                  :null => false
    t.datetime "updated_at",                  :null => false
    t.string   "description", :default => "", :null => false
->>>>>>> 2f1f05d431d1df062e46365930b98b358554a07d
  end

  create_table "users", :force => true do |t|