Update README.md

2022-01-27 23:18:28 +01:00
parent 0cdab851c5 6ebe9b9bff
commit a7b90b43c6
1 changed files with 6 additions and 1 deletions
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 # tvm
 TVM (Tiny Virtual Machine) is a 16bit VM based on the LC-3 architechture
+=======
+# gpvm
+ A general purpose virtual machine
+>>>>>>> 6ebe9b9bff36cedc8f3542f178e68e752e58a664