[Mapbender-commits] r9122 - trunk/mapbender/resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-11-04 23:00:06 -0800 (Tue, 04 Nov 2014)
New Revision: 9122

Modified:
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql
Log:
Bugfix - delete some svn relicts

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql	2014-10-29 16:30:00 UTC (rev 9121)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql	2014-11-05 07:00:06 UTC (rev 9122)
@@ -520,7 +520,7 @@
 ALTER TABLE wfs_output_formats
   OWNER TO postgres;
 
-<<<<<<< .mine
+
 -- Index für proxy-Log-Tabelle
 CREATE INDEX idx_mb_proxy_log_timestamp
 ON mb_proxy_log