Skip to content

Commit 7800ee8

Browse files
authored
Merge pull request #4153 from boundlessgeo/release-2_18-SldRotationFix
fixed forgot merge conflict message
2 parents db91e40 + 339fc10 commit 7800ee8

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

tests/src/python/test_qgssymbollayerv2_readsld.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
"""
44
***************************************************************************
5-
<<<<<<< 1746b32a08acfdaba35068127b25955ba7bd4b3b
6-
test_qgssymbollayer_readsld.py
7-
=======
85
test_qgssymbollayerv2_readsld.py
9-
>>>>>>> Tests and fix to read sld:Rotation when does not have ogc sub tags
106
---------------------
117
Date : January 2017
128
Copyright : (C) 2017, Jorge Gustavo Rocha

0 commit comments

Comments
 (0)