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)
commit8f18585d9b77a7e006f74fd94be74e014c791843
treebc084a4febb6a89558d1b1baa0d9166fd5ed47a5
parente3382563a24b6a3c162763942edefee462b2d752
fixing merge conflicts
src/config.c
src/main.c