fix shema after rebase

2012-02-19 19:54:00 +02:00 · 2012-02-19 19:54:00 +02:00 · 12ea84fe46
parent 57271da612
commit 12ea84fe46
1 changed files with 0 additions and 4 deletions
--- 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"