diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Data/PGSQL/PGSQLManager.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLManager.cs')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs index af5a7cd..276a37c 100644 --- a/OpenSim/Data/PGSQL/PGSQLManager.cs +++ b/OpenSim/Data/PGSQL/PGSQLManager.cs | |||
| @@ -326,7 +326,7 @@ namespace OpenSim.Data.PGSQL | |||
| 326 | /// <param name="migrationStore">migrationStore.</param> | 326 | /// <param name="migrationStore">migrationStore.</param> |
| 327 | public void CheckMigration(string migrationStore) | 327 | public void CheckMigration(string migrationStore) |
| 328 | { | 328 | { |
| 329 | using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) | 329 | using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) |
| 330 | { | 330 | { |
| 331 | connection.Open(); | 331 | connection.Open(); |
| 332 | Assembly assem = GetType().Assembly; | 332 | Assembly assem = GetType().Assembly; |