Please sign in to comment.
I need to understand git....
Merge branch 'master' of https://github.com/paines/cl-puyopuyo Conflicts: cl-puyopuyo.lisp
- Loading branch information...
|@@ -1,6 +1,3 @@|
|-To start via slime:|
|+This is a Puyopuyo clone, a Tetris variant, written in Common Lisp, with SDL for graphics.|
|+This is my first ever Lisp project.|
Deleted file not rendered