Merge pull request #4153 from boundlessgeo/release-2_18-SldRotationFix

fixed forgot merge conflict message
qgis · Feb 16, 2017 · 7800ee8 · 7800ee8
2 parents db91e40 + 339fc10
commit 7800ee8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/src/python/test_qgssymbollayerv2_readsld.py b/tests/src/python/test_qgssymbollayerv2_readsld.py
@@ -2,11 +2,7 @@
 
 """
 ***************************************************************************
-<<<<<<< 1746b32a08acfdaba35068127b25955ba7bd4b3b
-    test_qgssymbollayer_readsld.py
-=======
     test_qgssymbollayerv2_readsld.py
->>>>>>> Tests and fix to read sld:Rotation when does not have ogc sub tags
     ---------------------
     Date                 : January 2017
     Copyright            : (C) 2017, Jorge Gustavo Rocha