From 7a87be50151e5d39ffb96ce7ff923db6d067a950 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 24 Jan 2012 00:45:17 +0000
Subject: Fix merge artefacts and build break

---
 OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index a346548..f750a86 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1029,7 +1029,7 @@ namespace OpenSim.Data.MySQL
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
                             "?TerrainImageID, ?block_search, ?casino, " +
-                            "?TelehubObject, " +
+                            "?TelehubObject";
 
                         FillRegionSettingsCommand(cmd, rs);
 
-- 
cgit v1.1