summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ortho.s3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/ortho.s b/test/ortho.s
index 83f3554..4ca01f3 100644
--- a/test/ortho.s
+++ b/test/ortho.s
@@ -9,7 +9,10 @@ mem:
reset:
cps
lds.d #$3FFFF
+<<<<<<< HEAD
mov a, #10
+=======
+>>>>>>> 673efac... - Implemented support for the Orthogonal extension into
and #0
tay
xor b, b