#
#
# patch "options_list.hh"
#  from [872b69d45a0ac08b4f8cc04d9fc7c294a132d579]
#    to [45a1d98927261c0e8611fdfb5eddb5c35378a980]
#
============================================================
--- options_list.hh	872b69d45a0ac08b4f8cc04d9fc7c294a132d579
+++ options_list.hh	45a1d98927261c0e8611fdfb5eddb5c35378a980
@@ -658,6 +658,7 @@ OPTION(resolve_conflicts_opts, resolve_c
     F("only one of --resolve-conflicts or --resolve-conflicts-file may be given"));
   resolve_conflicts = arg;
 }
+#endif
 
 OPTSET(conflicts_opts)
 OPTVAR(conflicts_opts, system_path, conflicts_file, system_path("_MTN/conflicts"))
@@ -670,8 +671,6 @@ OPTION(conflicts_opts, conflicts_file, t
 }
 #endif
 
-#endif
-
 // Local Variables:
 // mode: C++
 // fill-column: 76