fix up merge conflicts to compile on strict settings
authorkremlin <ian@kremlin.cc>
Thu, 26 Jun 2014 02:16:18 +0000 (21:16 -0500)
committerkremlin <ian@kremlin.cc>
Thu, 26 Jun 2014 02:16:18 +0000 (21:16 -0500)
commit446ae274212d67709f0079bef602cac4e9e07a4a
tree60ed7972e3274d96ca4e29a971e3af855c800496
parent8f18585d9b77a7e006f74fd94be74e014c791843
fix up merge conflicts to compile on strict settings
src/config.c