Skip to content
Permalink
Browse files

fixed forgot merge conflict message

  • Loading branch information
luipir committed Jan 24, 2017
1 parent 6e20c07 commit 941d5f75b846e1603c29e6e3441eb9045d339509
Showing with 0 additions and 4 deletions.
  1. +0 −4 tests/src/python/test_qgssymbollayer_readsld.py
@@ -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

0 comments on commit 941d5f7

Please sign in to comment.
You can’t perform that action at this time.