deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed db/schema

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-01 16:07:55 +02:00
parent 5c3cb47c16
commit 87f555e1ef
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
db/schema.rb
View file

@ -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|