projects
/
systembsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
see previous commit, forgot 'git add'..
[systembsd.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index fc50a2445cdd8bc547163381d62f59c52ea7f6ab..a592502631d4910631567bb44c4abd08ebbd392b 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-28,7
+28,6
@@
//#include "main/h"
gboolean systemd_utils_init() {
//#include "main/h"
gboolean systemd_utils_init() {
-<<<<<<< HEAD
#ifdef INSTALL
if(!config_init()) {
gchar *tmp;
#ifdef INSTALL
if(!config_init()) {
gchar *tmp;
@@
-38,7
+37,7
@@
gboolean systemd_utils_init() {
return FALSE;
}
if(!init_xml()) {
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]);
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;
}
#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() {
}
int main() {