From 446ae274212d67709f0079bef602cac4e9e07a4a Mon Sep 17 00:00:00 2001
From: kremlin <ian@kremlin.cc>
Date: Wed, 25 Jun 2014 21:16:18 -0500
Subject: [PATCH] fix up merge conflicts to compile on strict settings

---
 src/config.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/config.c b/src/config.c
index 54003fa..2d76106 100644
--- a/src/config.c
+++ b/src/config.c
@@ -122,6 +122,7 @@ gboolean config_init() {
         g_printf("could not read config at %s! exiting..", config_path);
         return FALSE;
     }
+}
 
 gboolean init_xml() {
 
@@ -148,10 +149,9 @@ gboolean init_xml() {
 		}
 
 		//set_xml_descriptors();
-		return TRUE; //kill me!
 	}
 }
-}
+
 //LEFTOFF
 		
 /*		gchar *posix_hostname;
@@ -195,7 +195,7 @@ gboolean init_xml() {
 	return TRUE;
 } */
 
-/*static void set_xml_descriptors() {
+static void set_xml_descriptors() {
 	
 }
 
@@ -205,4 +205,4 @@ void clean_config() {
 	g_free(config);
 	g_free(data_dir);
 	g_close(config_descr, NULL);
-}*/
+}
-- 
2.41.0