Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

make tests work again

Browse source
This commit is contained in:
wvengen 2013-06-25 13:04:55 +02:00
parent e450cf404e
commit 91c8be6b6c
6 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/fixtures/articles.yml vendored
View file

@ -1,8 +1,4 @@
# == Schema Information
<<<<<<< HEAD:test/fixtures/articles.yml
=======
# Schema version: 20090325175756
>>>>>>> wiki:test/fixtures/articles.yml
#
# Table name: articles
#