Merge conflict...

This commit is contained in:
larstvei 2013-12-15 22:56:42 +01:00
parent 135931dce1
commit b7838c51dd

View File

@ -2,11 +2,9 @@ etype
=====
A typing game for Emacs.
<<<<<<< HEAD
Etype is a game written for Emacs, and is heavily inspired by
[Z-Type](http://phoboslab.org/ztype/).
##Not yet playable.
=======
>>>>>>> 1eaa79794e403f9dcbf289f403465e362e8e749c