Missed merge conflict resolveed.

cmsc430 · Jul 9, 2023 · 7a5a4a5 · 7a5a4a5
1 parent 805f6d0
commit 7a5a4a5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/www/notes/a86.scrbl b/www/notes/a86.scrbl
@@ -810,11 +810,7 @@ Each register plays the same role as in x86, so for example
  (ex
  (asm-display
    (prog (Global 'foo)
-<<<<<<< HEAD
          (%%% "Start of foo")
-=======
-         (%%% "Start of foo")        
->>>>>>> main
          (Label 'foo)
          ; Racket comments won't appear
          (%% "Inputs one argument in rdi")