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)
commite37568761299fe5228c88187dfc691330cf09f9d
tree60ed7972e3274d96ca4e29a971e3af855c800496
parent94304e786b09589046e9ac4e38e2dffca29564b4
fix up merge conflicts to compile on strict settings
src/config.c