From 498756102a430d68018ff39502b568f93a110227 Mon Sep 17 00:00:00 2001
From: mrb0nk500 <b0nk@b0nk.xyz>
Date: Tue, 8 Dec 2020 10:42:10 -0500
Subject: - Implemented support for the Orthogonal extension into   both the
 assembler, and the emulator.

  I finally figured out how I could get support for the
  Ortho extension implemented into the old assembler.

  The only reason for doing this, is to buy me some
  while I start work on the new assembler, and to help
  me get an idea for how to do the same in the new
  assembler.
---
 test/ortho.s | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test')

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
-- 
cgit v1.2.3-13-gbd6f