BillyJackDF/masterwork-dwarf-fortress — pull request #1 by pjf (2013-12-25 23:21:06+00:00)
Title: Don't worry Billy Jack, I'll save you!

I have no idea why creature_masterwork.txt caused a conflict; after manually resolving it the result was exactly the same as your file. Thank goodness for `git mergetool`, which allows one to use a graphical tool to resolve conflicts, rather than doing it by hand.

Hopefully conflicts after this should be relatively rare. :)

After accepting this pull request, you should be able to do a `git pull`, and all will be well.

Enjoy!