From 97ec54e0373d013a0d0542b2bf8ef68283519280 Mon Sep 17 00:00:00 2001
From: Erick <ahmederick00@gmail.com>
Date: Thu, 27 Jan 2022 23:19:27 +0100
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 37e6648..920dc0c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 # tvm
-TVM (Tiny Virtual Machine) is a 16bit VM based on the LC-3 architechture
-=======
-# gpvm
- A general purpose virtual machine
->>>>>>> 6ebe9b9bff36cedc8f3542f178e68e752e58a664
+TVM (Tiny Virtual Machine) is a 16bit VM based on the LC-3 architechture
\ No newline at end of file