diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Data/MySQL/Resources/UserProfiles.migrations')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/UserProfiles.migrations | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations index 87e99fa..3df9b9b 100644 --- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |||
| @@ -81,6 +81,7 @@ CREATE TABLE IF NOT EXISTS `userdata` ( | |||
| 81 | 81 | ||
| 82 | commit; | 82 | commit; |
| 83 | 83 | ||
| 84 | <<<<<<< HEAD | ||
| 84 | :VERSION 3 # ------------------------------- | 85 | :VERSION 3 # ------------------------------- |
| 85 | begin; | 86 | begin; |
| 86 | CREATE TABLE IF NOT EXISTS `usersettings` ( | 87 | CREATE TABLE IF NOT EXISTS `usersettings` ( |
| @@ -96,3 +97,5 @@ commit; | |||
| 96 | begin; | 97 | begin; |
| 97 | ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); | 98 | ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); |
| 98 | commit; | 99 | commit; |
| 100 | ======= | ||
| 101 | >>>>>>> avn/ubitvar | ||