Compiling Error

[SlashGeeGee]

Hello rA

I've applied few source mods then updated my rAthena server files then I got these errors when i compile :

1>c:\ragnarok files\rathena\src\map\atcommand.c(1999): error C2059: syntax error : '<<'
1>c:\ragnarok files\rathena\src\map\atcommand.c(2029): warning C4034: sizeof returns 0
1>c:\ragnarok files\rathena\src\map\atcommand.c(2139): warning C4034: sizeof returns 0

here's my atcommand.c:

http://www.mediafire.com/?j92wgq37375e403

Please Help me

SlashGeeGee

[malufett]

just edit the conflicts...by using tortoise right click the file then 'edit conflicts'...

or open the file then chose what you what and deleting the old one/new one

<<<<<<< .mine

{ MAP_DICASTES, 198, 187 },

// 30=El Dicastes

{ MAP_MORA, 44, 151 },

// 31=Mora

{ MAP_DEWATA, 200, 180 },

// 32=Dewata

{ MAP_MALANGDO, 140, 114 },

// 33=Malangdo Island

{ MAP_MALAYA, 232, 222 },

// 34=Malaya Port

{ MAP_ECLAGE, 110, 39 },

// 35=Eclage

=======

{ MAP_DICASTES, 198, 187 },

// 30=El Dicastes

{ MAP_MORA, 44, 151 },

// 31=Mora

{ MAP_DEWATA, 200, 180 },

// 32=Dewata

{ MAP_MALANGDO, 140, 114 },

// 33=Malangdo Island

{ MAP_MALAYA, 242, 211 },

// 34=Malaya Port

{ MAP_ECLAGE, 110, 39 },

// 35=Eclage

>>>>>>> .r16590

[SlashGeeGee]

just edit the conflicts...by using tortoise right click the file then 'edit conflicts'...

or open the file then chose what you what and deleting the old one/new one

<<<<<<< .mine

{ MAP_DICASTES, 198, 187 },

// 30=El Dicastes

{ MAP_MORA, 44, 151 },

// 31=Mora

{ MAP_DEWATA, 200, 180 },

// 32=Dewata

{ MAP_MALANGDO, 140, 114 },

// 33=Malangdo Island

{ MAP_MALAYA, 232, 222 },

// 34=Malaya Port

{ MAP_ECLAGE, 110, 39 },

// 35=Eclage

=======

{ MAP_DICASTES, 198, 187 },

// 30=El Dicastes

{ MAP_MORA, 44, 151 },

// 31=Mora

{ MAP_DEWATA, 200, 180 },

// 32=Dewata

{ MAP_MALANGDO, 140, 114 },

// 33=Malangdo Island

{ MAP_MALAYA, 242, 211 },

// 34=Malaya Port

{ MAP_ECLAGE, 110, 39 },

// 35=Eclage

>>>>>>> .r16590

THanks malufett