From 09d9b772369e3099a6ca28c7c3e2cb9c8a86ab6f Mon Sep 17 00:00:00 2001
From: Michael <34347626+Michael2-3B@users.noreply.github.com>
Date: Thu, 20 Jan 2022 01:13:28 -0600
Subject: [PATCH] Update README.md

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index de300d9..06b3a00 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
 # Iso-Render
 
-<<<<<<< HEAD
 Rendering beautiful isometric terrain, using sprites, in C on the TI-84+ CE.
 
 ![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render013.png)
-=======
-Rendering isometric terrain in the C language on the TI-84+ CE.
-
-![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render008.png)
->>>>>>> 2513079edc2e48625929587f7495c24db11aedf3