From 94304e786b09589046e9ac4e38e2dffca29564b4 Mon Sep 17 00:00:00 2001
From: kremlin- <ian@kremlin.cc>
Date: Wed, 25 Jun 2014 21:06:06 -0500
Subject: fixing merge conflicts

---
 src/main.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index fc50a24..da8cdc6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,6 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
-<<<<<<< HEAD
 	#ifdef INSTALL
 		if(!config_init()) {
 			gchar *tmp;
@@ -37,24 +36,15 @@ gboolean systemd_utils_init() {
 			g_printf("FAILED to install configs in %s!\n", tmp);
 			return FALSE;
 		} 
-		if(!init_xml()) {
+		/*if(!init_xml()) {
 			gchar **tmp;
 			tmp = g_get_system_data_dirs();
 
 			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
 			return FALSE;
-		}
+		}*/
 	#endif
 	return TRUE;
-=======
-    #ifdef INSTALL
-        if(!config_init()) {
-            g_printf("%s\n", "FAILED to install configs in /etc/!");
-            return FALSE; 
-        }
-    #endif
-    return TRUE;
->>>>>>> master
 }
 
 int main() {
-- 
cgit v1.2.3