From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 scripts/kconfig/lxdialog/util.c |   16 ----------------
 1 file changed, 16 deletions(-)

diff -puN scripts/kconfig/lxdialog/util.c~git-lxdialog-fixup scripts/kconfig/lxdialog/util.c
--- a/scripts/kconfig/lxdialog/util.c~git-lxdialog-fixup
+++ a/scripts/kconfig/lxdialog/util.c
@@ -219,7 +219,6 @@ static void init_dialog_colors(void)
 /*
  * Setup for color display
  */
-<<<<<<< HEAD/scripts/kconfig/lxdialog/util.c
 static void color_setup(const char *theme)
 {
 	int use_color;
@@ -231,21 +230,6 @@ static void color_setup(const char *them
 	} else
 		set_mono_theme();
 }
-=======
-static void color_setup(const char *theme)
-{
-	if (set_theme(theme)) {
-		if (has_colors()) {	/* Terminal supports color? */
-			start_color();
-			init_dialog_colors();
-		}
-	}
-	else
-	{
-		set_mono_theme();
-	}
-}
->>>>>>> /scripts/kconfig/lxdialog/util.c
 
 /*
  * Set window to attribute 'attr'
_