From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 May 2011 13:05:55 +0000 (+0100)
Subject: Cleanup merge breakage
X-Git-Tag: live~6278
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4e38994d1b287300d6ebd5a34583ade657fb3149

Cleanup merge breakage
---

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 360738c22..ba66d8795 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -73,6 +73,7 @@ administrator_user:
   creation_time: "2008-05-01 01:23:45"
   display_name: administrator
   data_public: true
+  terms_seen: true
 
 terms_not_seen_user:
   id: 7