BUG: fix merge conflicts

a334a72b · Rashad Kanavath · e48cb049 · a334a72b
Commit a334a72b authored Sep 25, 2015 by Rashad Kanavath
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx +0 -1

No files found.
--- a/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
+++ b/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
@@ -182,7 +182,6 @@ convertToGDALRPC(GDALRPCInfo &rpc) const
      }
   }
   return false;
->>>>>>> b6d7b16... BUG: check 'polynomial_format' key on internal keywordmap
 }

 void