This does not compile

[mboratko]

After cloning and doing a ./configure, the Makefile ends up with tons of git merge lines in it such as
<<<<<< HEAD

It seems as though you have not cleared the various merge conflict which arose from 2110239

[kfogel]

Thanks for pointing this out, @process91. There are indeed a ton of conflict markers resulting from that merge, and not all of them are trivially resolveable.

Does anyone know (waves at @risacher) how a merge that is supposedly just an "Update to latest version of CACKey" could have conflicts? It seems our copy and whatever @rkeene was drawing from must have diverged somewhere...