clean up a merge conflict and remove a console message

0.6.0-stable
Sean Dague 2008-10-15 21:00:08 +00:00
parent d77ebb5761
commit ceb5830142
1 changed files with 1 additions and 0 deletions

View File

@ -126,6 +126,7 @@ namespace OpenSim.Data.Tests
UserProfileData u1 = NewUser(user1,fname1,lname1); UserProfileData u1 = NewUser(user1,fname1,lname1);
UserProfileData u2 = NewUser(user2,fname2,lname2); UserProfileData u2 = NewUser(user2,fname2,lname2);
UserProfileData u3 = NewUser(user3,fname3,lname3); UserProfileData u3 = NewUser(user3,fname3,lname3);
db.AddNewUserProfile(u1); db.AddNewUserProfile(u1);
db.AddNewUserProfile(u2); db.AddNewUserProfile(u2);
db.AddNewUserProfile(u3); db.AddNewUserProfile(u3);