Download as
Browse Code »

Commit 12ea84fe46b7175e67ac1c683267214bd6c064f8

Authored by Valery Sizov
1 parent 57271da6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix shema after rebase

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