merge conflict resolved

2022-03-10 02:31:05 +00:00 · 2022-03-10 02:31:05 +00:00 · 701c274a32
commit 701c274a32
parent 4099ff8497
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -477,11 +477,7 @@ function vm_boot() {
      fi

      if [ "${guest_os}" == "freedos" ] ; then
-<<<<<<< HEAD
-        # fix for #382
-=======
        # fix for booting issue discussed in #382
->>>>>>> eb67e14 (freedos fix - boot problems needed smm on)
        SMM="on"
      fi