fixing merge conflicts

[systembsd.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index fc50a2445cdd8bc547163381d62f59c52ea7f6ab..da8cdc68333c80aea24f55ce82985edae9d2037b 100644 (file)
--- 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() {