Skip to content
GitLab
Commit a334a72b authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

BUG: fix merge conflicts

parent e48cb049
Hide whitespace changes
Inline Side-by-side
Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
View file @ a334a72b
......@@ -182,7 +182,6 @@ convertToGDALRPC(GDALRPCInfo &rpc) const
}
}
return false;
>>>>>>> b6d7b16... BUG: check 'polynomial_format' key on internal keywordmap
}
void
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment