fixing merge conflicts
authorkremlin- <ian@kremlin.cc>
Thu, 26 Jun 2014 02:06:06 +0000 (21:06 -0500)
committerkremlin- <ian@kremlin.cc>
Thu, 26 Jun 2014 02:06:06 +0000 (21:06 -0500)
commit94304e786b09589046e9ac4e38e2dffca29564b4
treebc084a4febb6a89558d1b1baa0d9166fd5ed47a5
parente8f563da640afecdbe77027d7d27e0768f52bebc
fixing merge conflicts
src/config.c
src/main.c