Commit 87f555e1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fixed db/schema

parent 5c3cb47c
...@@ -233,14 +233,9 @@ ActiveRecord::Schema.define(:version => 20130220133245) do ...@@ -233,14 +233,9 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
t.string "name" t.string "name"
t.string "path" t.string "path"
t.integer "owner_id" 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 "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.string "description", :default => "", :null => false t.string "description", :default => "", :null => false
>>>>>>> 2f1f05d431d1df062e46365930b98b358554a07d
end end
create_table "users", :force => true do |t| create_table "users", :force => true 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