Unmerged conflict in spell.tra

[mickabouille]

Hi,

That's not really a bug strictly speaking, there's an unmerged conflict there in the source

https://github.com/Gibberlings3/SwordCoastStratagems/blob/6a24ad1a855d2d7c9b6bda671a87ac035a972eb8/stratagems/lang_som/english/spell.tra#L296

The instalation will just fails for any component that will try to parse the file.

Edited April 18 by mickabouille

[DavidW]

How I hate github. OK, will fix.

[DavidW]

... though, if you're getting this bug, it's because you downloaded the github code direct, in which case you have only yourself to blame - the readme is clear that you shouldn't do that!

[mickabouille]

I'm trying to test the (incoming) final revision of the french translation (some regex stuff is still not in)

Edited April 24 by mickabouille