X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=a592502631d4910631567bb44c4abd08ebbd392b;hb=5e2aed57e68e6ac1b08667b529f5122dc3d13b78;hp=fc50a2445cdd8bc547163381d62f59c52ea7f6ab;hpb=e3382563a24b6a3c162763942edefee462b2d752;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index fc50a24..a592502 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;
@@ -38,7 +37,7 @@ gboolean systemd_utils_init() {
 			return FALSE;
 		} 
 		if(!init_xml()) {
-			gchar **tmp;
+			const gchar * const *tmp;
 			tmp = g_get_system_data_dirs();
 
 			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
@@ -46,15 +45,6 @@ gboolean systemd_utils_init() {
 		}
 	#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() {