Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed schema.rb.

Browse source
This commit is contained in:
Robert Waltemath 2013-06-12 10:20:06 +02:00
parent 46b07a6136
commit 71d8f9bde7
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
db/schema.rb
View file

@ -319,16 +319,9 @@ ActiveRecord::Schema.define(:version => 20121230142516) do
t.date "due_date" t.date "due_date"
t.boolean "done", :default => false t.boolean "done", :default => false
t.integer "workgroup_id" t.integer "workgroup_id"
<<<<<<< HEAD
t.datetime "created_on", :null => false
t.datetime "updated_on", :null => false
t.integer "required_users", :default => 1
=======
t.boolean "assigned", :default => false
t.datetime "created_on", :null => false t.datetime "created_on", :null => false
t.datetime "updated_on", :null => false t.datetime "updated_on", :null => false
t.integer "required_users", :default => 1 t.integer "required_users", :default => 1
>>>>>>> 1cdb9e85017a17e4dbee276cd87feaa2aab75932
t.boolean "weekly" t.boolean "weekly"
t.integer "duration", :default => 1 t.integer "duration", :default => 1
t.integer "periodic_task_group_id" t.integer "periodic_task_group_id"