fix shema after rebase

12ea84fe · Valery Sizov · 57271da6 · 12ea84fe
Commit 12ea84fe authored Feb 19, 2012 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

schema.rb db/schema.rb +0 -4

No files found.
--- 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"