Yep, that's definitely an incomplete merge. I'd get rid of the following: <<<<<<< local #define __name "GSS HIDS" #define __version "v2.6" =======
and try again. (hg resolve --mark src/headers/defs.h && hg commit -m merge) On Wed, Aug 15, 2012 at 7:38 AM, Peter M Abraham <[email protected]> wrote: > Hi JB: > > /* Some Global names */ > <<<<<<< local > #define __name "GSS HIDS" > #define __version "v2.6" > ======= > #define __name "OSSEC HIDS" > #define __version "v2012-08" > > > Thank you. >
