Skip to content

Commit

Permalink
fixed forgot merge conflict message
Browse files Browse the repository at this point in the history
  • Loading branch information
luipir committed Feb 16, 2017
1 parent e4d3da2 commit 339fc10
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions tests/src/python/test_qgssymbollayerv2_readsld.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 339fc10

Please sign in to comment.