OpenXiangShan
/
nexus-am
mirror of https://github.com/OpenXiangShan/nexus-am.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup and merge

This commit is contained in:
reccetear 2017-04-20 22:31:11 +08:00
parent 0b9d769c91
commit 46b81df560
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -1,8 +1,3 @@
<<<<<<< HEAD
# The Abstract Machine
"Abstract" machine for building a complete computer system from scratch.
=======
# Abstract-Machine
We need An Abstract Machine
>>>>>>> 180cd07b79a5213b8961214c6d87e3c056314cd1