default USE_FALLBACK_IMAGE to 0

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1170 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2003-10-01 17:28:48 +00:00 · 2003-10-01 17:28:48 +00:00 · 6358a4a003
parent 848d336534
commit 6358a4a003
1 changed files with 0 additions and 4 deletions
--- 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