Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed forgot merge conflict message
  • Loading branch information
luipir committed Jan 24, 2017
1 parent 6e20c07 commit 941d5f7
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions tests/src/python/test_qgssymbollayer_readsld.py
Expand Up @@ -2,11 +2,7 @@

"""
***************************************************************************
<<<<<<< b3e8d8219090068ba14a67004f9412633a6ec7b3
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
Expand Down

0 comments on commit 941d5f7

Please sign in to comment.