diff options
Diffstat (limited to 'src/config/Options.lb')
-rw-r--r-- | src/config/Options.lb | 4 |
1 files changed, 0 insertions, 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 |