diff options
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index a6cf39c58ad..752da4b5449 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -<<<<<<< HEAD -ActiveRecord::Schema.define(:version => 20120216085842) do -======= ActiveRecord::Schema.define(:version => 20120219140810) do ->>>>>>> wiki base sceleton create_table "issues", :force => true do |t| t.string "title" |