Vaine
-
Posts
1 -
Joined
-
Last visited
Never -
Donations
0.00 GBP
We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use
[Guide] Updating for Windows
in OldInstallation, configuration & upgrades
Posted
When merging:
Automatic merge failed; fix conflicts and then commit the result.
warning: Cannot merge binary files: contrib/extractor/ad.exe (HEAD vs. origin/mangos-0.12)
warning: Cannot merge binary files: contrib/vmap_extract_assembler_bin/vmapextract_v2.exe (HEAD vs. origin/mangos-0.12)
Erm..halp
Edit: apologies, epic necro