From 6358a4a0030f074af76f6bf8dbf5725e11a3b3c0 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Wed, 1 Oct 2003 17:28:48 +0000
Subject: [PATCH] default USE_FALLBACK_IMAGE to 0

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1170 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/config/Options.lb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/config/Options.lb b/src/config/Options.lb
index c5363d0f5a..cfc8670d69 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -184,12 +184,8 @@ define HAVE_FALLBACK_BOOT
 	comment "Set if fallback booting required"
 end
 define USE_FALLBACK_IMAGE
-<<<<<<< Options.lb
 	format "%d"
 	default 0
-=======
-	default 1
->>>>>>> 1.23
 	export used
 	comment "Set to build a fallback image"
 end