Red Hat Bugzilla – Bug 838549
Integration-Branch.patch contains conflict markers
Last modified: 2012-07-10 10:00:38 EDT
The Integration-Branch.patch file patches files with conflict markers (as of version 7.6.5-0.17):
+ \item \verb@DAEMON_LIST@
@@ -437,6 +441,10 @@ the changed value.
+ \item \verb@EC2_GAHP@
They appear to have been introduce in 7.6.5-0.13.
This could be benign, but I think it's worth cleaning this up.
It is benign, these are markers in the main documentation which is not used in our packages. I purposefully did not fix b/c it is a zero sum gain.