From: Andrew Morton <akpm@osdl.org>

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

 scripts/kconfig/lxdialog/util.c |   16 ----------------
 scripts/kconfig/mconf.c         |   13 -------------
 2 files changed, 29 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'
diff -puN scripts/kconfig/mconf.c~git-lxdialog-fixup scripts/kconfig/mconf.c
--- a/scripts/kconfig/mconf.c~git-lxdialog-fixup
+++ a/scripts/kconfig/mconf.c
@@ -888,7 +888,6 @@ int main(int ac, char **av)
 	reset_dialog();
 	init_dialog(menu_backtitle);
 	do {
-<<<<<<< HEAD/scripts/kconfig/mconf.c
 		conf(&rootmenu);
 		dialog_clear();
 		if (conf_get_changed())
@@ -904,18 +903,6 @@ int main(int ac, char **av)
 
 	switch (res) {
 	case 0:
-=======
-		conf(&rootmenu);
-		dialog_clear();
-		res = dialog_yesno(NULL,
-				   _("Do you wish to save your "
-				     "new kernel configuration?\n"
-				     "<ESC><ESC> to continue."),
-				   6, 60);
-	} while (res == KEY_ESC);
-	end_dialog();
-	if (res == 0) {
->>>>>>> /scripts/kconfig/mconf.c
 		if (conf_write(NULL)) {
 			fprintf(stderr, _("\n\n"
 				"Error during writing of the kernel configuration.\n"
_