fixed forgot merge conflict message

qgis · Feb 16, 2017 · 852b9af4ed4d399c1c4f1d2f7646897ca1bd0433 · 852b9af
1 parent e05a8ca
commit 852b9af4ed4d399c1c4f1d2f7646897ca1bd0433
Unified Split

Showing with 0 additions and 4 deletions.

+0 −4 tests/src/python/test_qgssymbollayerv2_readsld.py
diff --git a/tests/src/python/test_qgssymbollayerv2_readsld.py b/tests/src/python/test_qgssymbollayerv2_readsld.py
@@ -2,11 +2,7 @@
 
 """
 ***************************************************************************
-<<<<<<< bee5f8063794cb7e5fc48b5e0562c20de3249d74
-    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