[OpenLayers-Commits] r2377 - sandbox/vector/lib/OpenLayers

[commits at openlayers.org]

Author: crschmidt
Date: 2007-03-06 09:57:54 -0500 (Tue, 06 Mar 2007)
New Revision: 2377

Modified:
   sandbox/vector/lib/OpenLayers/Util.js
Log:
Fix broken merge. My bad.


Modified: sandbox/vector/lib/OpenLayers/Util.js
===================================================================
--- sandbox/vector/lib/OpenLayers/Util.js	2007-03-06 03:53:39 UTC (rev 2376)
+++ sandbox/vector/lib/OpenLayers/Util.js	2007-03-06 14:57:54 UTC (rev 2377)
@@ -1097,8 +1097,6 @@
 
     return urlObject; 
 };
-<<<<<<< .working
-=======
  
 /**
  * @param {String} url
@@ -1120,4 +1118,3 @@
     }
     return head;
 };
->>>>>>> .merge-right.r2307