ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/MySQL/Resources/UserProfiles.migrations
View File

@@ -81,6 +81,7 @@ CREATE TABLE IF NOT EXISTS `userdata` (
commit;
<<<<<<< HEAD
:VERSION 3 # -------------------------------
begin;
CREATE TABLE IF NOT EXISTS `usersettings` (
@@ -96,3 +97,5 @@ commit;
begin;
ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
commit;
=======
>>>>>>> avn/ubitvar