[fusion-commits] r3027 - trunk/layers/MapGuide

[svn_fusion at osgeo.org]

Author: jng
Date: 2018-03-08 05:36:17 -0800 (Thu, 08 Mar 2018)
New Revision: 3027

Modified:
   trunk/layers/MapGuide/MapGuide.js
Log:
I thought I resolved this conflict already!

Modified: trunk/layers/MapGuide/MapGuide.js
===================================================================
--- trunk/layers/MapGuide/MapGuide.js	2018-03-08 13:23:01 UTC (rev 3026)
+++ trunk/layers/MapGuide/MapGuide.js	2018-03-08 13:36:17 UTC (rev 3027)
@@ -1904,16 +1904,10 @@
       if (!this.singleTile) {
           var center = this.mapWidget.oMapOL.getCenter();
           var display = this.mapWidget.oMapOL.getSize();
-<<<<<<< .working
-
-||||||| .merge-left.r3007
-          
-=======
           var showGroups = this.aShowGroups.length > 0 ? this.aShowGroups.toString() : null;
           var hideGroups = this.aHideGroups.length > 0 ? this.aHideGroups.toString() : null;
           this.aShowGroups = [];
           this.aHideGroups = [];
->>>>>>> .merge-right.r3012
           var r = new Fusion.Lib.MGRequest.MGGetVisibleMapExtent(this.getSessionID(),
                                                               this._sMapname,
                                                               center.lon, center.lat,