Bank.scar

[Dynamite]

Don't know where to put this but
<<<<<<< .mine
'feb', 'fwb', 'veb', 'dab': if c = 0 then MakeCompass('N') else MakeCompass('S');
'akb', 'db', 'eb', 'vwb': if c = 0 then MakeCompass('E') else MakeCompass('W');
=======
'feb', 'fwb', 'veb', 'ctb', 'clt', 'nab': if c = 0 then MakeCompass('N') else MakeCompass('S');
'akb', 'db', 'eb', 'vwb', 'sab', 'ynb', 'sgb', 'wgb', 'fgb': if c = 0 then MakeCompass('E') else MakeCompass('W');
'ngb': if c = 0 then MakeCompass(45) else MakeCompass(225);
>>>>>>> .r42
What are the '<' and '=' ???

also I was getting duplicate identifier for CloseBank

T~M

[Method]

Delete the file and update SRL using Subversion again.

[Naike]

To follow up on Methods post..

This is created by a bug with Turtoise SVN.
And to fix it you simply do as Method said ;)

[Shuttleu]

but still no answer to his original question
i would too also like to know the answer

~shut

[senrath]

If I remember correctly, that is what happens when it attempts to merge your file with the file on the server and can't figure out what it's supposed to do. The stuff above the ='s (up to the <'s) is what was in your file, while the stuff below (down to the >'s) is what is on the server.

[Shuttleu]

ahhh... now i understand
thanks

~shut

[Nava2]

Moved to General Help.. :)