Update README.md

2022-01-27 23:19:27 +01:00
parent a7b90b43c6
commit 97ec54e037
1 changed files with 1 additions and 6 deletions
@@ -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