deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix shema after rebase

Browse source
This commit is contained in:
Valery Sizov 2012-02-19 19:54:00 +02:00
parent 57271da612
commit 12ea84fe46
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db/schema.rb
View file

@ -11,11 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # 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 ActiveRecord::Schema.define(:version => 20120219140810) do
>>>>>>> wiki base sceleton
create_table "issues", :force => true do |t| create_table "issues", :force => true do |t|
t.string "title" t.string "title"