make tests work again

test/fixtures/articles.yml

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

test/fixtures/groups.yml

@@ -3,6 +3,7 @@ admins:
   type: Workgroup
   name: Administrators
   description: System administrators.
+  created_on: <%= 5.weeks.ago.to_s(:db) %>
   role_admin: true
   role_suppliers: true
   role_article_meta: true
@@ -11,12 +12,8 @@ admins:
 bananas:
   type: Ordergroup
   name: Banangroup
+  created_on: <%= 4.weeks.ago.to_s(:db) %>
   account_balance: 100.00
-  account_updated: <%= 1.weeks.ago.to_s(:db) %>
   contact_person: Tim
   contact_phone: 030 123132456
   contact_address: Waldermarstrasse 43, 10988 Berlin
-
-
-
-

test/fixtures/suppliers.yml

@@ -1,8 +1,4 @@
 # == Schema Information
-<<<<<<< HEAD:test/fixtures/suppliers.yml
-=======
-# Schema version: 20090325175756
->>>>>>> wiki:test/fixtures/suppliers.yml
 #
 # Table name: suppliers
 #
@@ -38,12 +34,3 @@ terra:
     Terra possibly delivers also on other days than tuesday. Don't
     hesitate to ask for it.
   min_order_quantity: 80,-€ (gross)
-  
-
-
-
-
-
-
-
-