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/PGSQL/Resources | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Data/PGSQL/Resources')
| -rw-r--r-- | OpenSim/Data/PGSQL/Resources/UserProfiles.migrations | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations index a6bd8ca..a67107a 100644 --- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations | |||
| @@ -81,6 +81,7 @@ CREATE TABLE userdata ( | |||
| 81 | 81 | ||
| 82 | commit; | 82 | commit; |
| 83 | 83 | ||
| 84 | <<<<<<< HEAD | ||
| 84 | :VERSION 3 # ------------------------------- | 85 | :VERSION 3 # ------------------------------- |
| 85 | begin; | 86 | begin; |
| 86 | CREATE TABLE usersettings ( | 87 | CREATE TABLE usersettings ( |
| @@ -152,4 +153,6 @@ BEGIN; | |||
| 152 | 153 | ||
| 153 | ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END; | 154 | ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END; |
| 154 | 155 | ||
| 155 | COMMIT; \ No newline at end of file | 156 | COMMIT; |
| 157 | ======= | ||
| 158 | >>>>>>> avn/ubitvar | ||