Add .pro.user.* to svn:ignore and remove it in the release target.

[toast/confclerk.git] / src / mvc / conference.cpp

diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp
index a0e7f9356ae79e7403ec40b0f605072e37ba4e8f..b53255e0a59c3585f69ff2147cabc2b9fb3638e4 100644 (file)
--- a/src/mvc/conference.cpp
+++ b/src/mvc/conference.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -32,7 +33,6 @@ QSqlRecord const Conference::sColumns = Conference::toRecord(QList<QSqlField>()
     << QSqlField("timeslot_duration", QVariant::Int)
     << QSqlField("active", QVariant::Bool)
     << QSqlField("url", QVariant::String)
-    << QSqlField("map", QVariant::String)
     );
 
 QString const Conference::sTableName = QString("conference");