From 27bfc8e35fa02be1f8cb347e2f6830c825fb1d3c Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 4 Apr 2021 03:13:45 +0200
Subject: [PATCH] Update README.md

Commander X16
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 33c7d2830..b4d098dd3 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,10 @@ including
 - the Lynx console.
 - the Ohio Scientific Challenger 1P.
 - the Commander X16.
+<<<<<<< HEAD
 - the Synertek Systems Sym-1.
+=======
+>>>>>>> 2583dfb71 (Update README.md)
 
 The libraries are fairly portable, so creating a version for other 6502s
 shouldn't be too much work.