fix shema after rebase

Valery Sizov
1 parent 57271da6
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
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"
...	...	@@ -11,11 +11,7 @@
11	11	#
12	12	# It's strongly recommended to check this file into your version control system.
13	13
14		-<<<<<<< HEAD
15		-ActiveRecord::Schema.define(:version => 20120216085842) do
16		-=======
17	14	ActiveRecord::Schema.define(:version => 20120219140810) do
18		->>>>>>> wiki base sceleton
19	15
20	16	create_table "issues", :force => true do \|t\|
21	17	t.string "title"
...	...