aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-10-15 21:00:08 +0000
committerSean Dague2008-10-15 21:00:08 +0000
commitceb5830142f85ac24536d801d522da49411d64d5 (patch)
treeb4500713b9e9e29f53151383fad5c02147d0cbd2
parentThanks, idb, for a patch that fixes Mantis#2400: (diff)
downloadopensim-SC_OLD-ceb5830142f85ac24536d801d522da49411d64d5.zip
opensim-SC_OLD-ceb5830142f85ac24536d801d522da49411d64d5.tar.gz
opensim-SC_OLD-ceb5830142f85ac24536d801d522da49411d64d5.tar.bz2
opensim-SC_OLD-ceb5830142f85ac24536d801d522da49411d64d5.tar.xz
clean up a merge conflict and remove a console message
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs1
1 files changed, 1 insertions, 0 deletions
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
126 UserProfileData u1 = NewUser(user1,fname1,lname1); 126 UserProfileData u1 = NewUser(user1,fname1,lname1);
127 UserProfileData u2 = NewUser(user2,fname2,lname2); 127 UserProfileData u2 = NewUser(user2,fname2,lname2);
128 UserProfileData u3 = NewUser(user3,fname3,lname3); 128 UserProfileData u3 = NewUser(user3,fname3,lname3);
129
129 db.AddNewUserProfile(u1); 130 db.AddNewUserProfile(u1);
130 db.AddNewUserProfile(u2); 131 db.AddNewUserProfile(u2);
131 db.AddNewUserProfile(u3); 132 db.AddNewUserProfile(u3);