default USE_FALLBACK_IMAGE to 0

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1170 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/config/Options.lb b/src/config/Options.lb
index c5363d0f5ae3842b884b0cb7e2d67bf26815ee74..cfc8670d69a85b4e95bdbde6bfbeeabe40aba2e9 100644 (file)
--- 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