[gimp/gtk3-port-meson] Fix merge
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port-meson] Fix merge
- Date: Fri, 16 Feb 2018 16:19:54 +0000 (UTC)
commit 1f01c1d887ea0862b3cc54c2d814c70c16e796b2
Author: Félix Piédallu <felix piedallu me>
Date: Fri Feb 16 15:17:41 2018 +0100
Fix merge
libgimpbase/gimpenv.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/libgimpbase/gimpenv.c b/libgimpbase/gimpenv.c
index c74356e..98a8e83 100644
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@ -557,11 +557,7 @@ gimp_sysconf_directory (void)
GIMP_SYSCONF_VERSION,
NULL);
-<<<<<<< HEAD
- gimp_sysconf_dir = gimp_env_get_dir ("GIMP3_SYSCONFDIR", SYSCONFDIR, tmp);
-=======
- gimp_sysconf_dir = gimp_env_get_dir ("GIMP2_SYSCONFDIR", GIMPSYSCONFDIR, tmp);
->>>>>>> meson
+ gimp_sysconf_dir = gimp_env_get_dir ("GIMP3_SYSCONFDIR", GIMPSYSCONFDIR, tmp);
g_free (tmp);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]