Merge pull request #4152 from boundlessgeo/release-2_14-SldRotationFix

fixed forgot merge conflict message

Author: elpaso

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