From ceb5830142f85ac24536d801d522da49411d64d5 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 15 Oct 2008 21:00:08 +0000
Subject: clean up a merge conflict and remove a console message

---
 OpenSim/Data/Tests/BasicUserTest.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Data/Tests/BasicUserTest.cs')

diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 5d798d3..726ae84 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -126,6 +126,7 @@ namespace OpenSim.Data.Tests
             UserProfileData u1 = NewUser(user1,fname1,lname1);
             UserProfileData u2 = NewUser(user2,fname2,lname2);
             UserProfileData u3 = NewUser(user3,fname3,lname3);
+
             db.AddNewUserProfile(u1);
             db.AddNewUserProfile(u2);
             db.AddNewUserProfile(u3);
-- 
cgit v1.1