Compiling errors - help please

[Waz]

Yo,

I try to compile and I get four errors, I had more but I fixed quite a few.. I just can't figure these ones out. I'm gonna post the errors:

Error one & two

• 345 C:\Documents and Settings\Administrator\Desktop\Tervnim OTS\WOL_REVBATTLE\Sources\const80.h expected unqualified-id before '>>' token
• 345 C:\Documents and Settings\Administrator\Desktop\Tervnim OTS\WOL_REVBATTLE\Sources\const80.h expected `,' or `;' before '>>' token

Line
PlayerFlag_IsAlwaysPremium, //2^37 = 137438953472 (344)
};>>>>>>> .r2414 (345)
//add new flags here (346)

Error three

• 348 C:\Documents and Settings\Administrator\Desktop\Tervnim OTS\WOL_REVBATTLE\Sources\const80.h expected declaration before '}' token

Line
PlayerFlag_LastFlag (347)
}; (348)

Error four

• 22:1 C:\Documents and Settings\Administrator\Desktop\Tervnim OTS\WOL_REVBATTLE\Sources\creature.h unterminated #ifndef

Line
#ifdef __OTSERV_CONST80_H__ #endif (21)
#endif __OTSERV_CONST80_H__ #endif (22)

If anyone could help me, it'd be very appreciated.

 

[Mark]

First three errors, clean line 345 "};>>>>>>> .r2414"

Last error, you have an unclosed #ifndef, you have to close it with #endif.