Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sébastien Peillet
otb
Commits
a334a72b
Commit
a334a72b
authored
Sep 25, 2015
by
Rashad Kanavath
Browse files
BUG: fix merge conflicts
parent
e48cb049
Changes
1
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment