I need to understand git....

Merge branch 'master' of https://github.com/paines/cl-puyopuyo Conflicts: cl-puyopuyo.lisp
stylewarning · Feb 23, 2013 · 8a7786d · 8a7786d
2 parents f144947 + 88438b3
commit 8a7786d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,3 @@
-To start via slime:
-
-(load "package.lisp")
-
-(asdf:load-system "cl-puyopuyo")
+This is a Puyopuyo clone, a Tetris variant, written in Common Lisp, with SDL for graphics.
 
+This is my first ever Lisp project.
diff --git a/paused.png b/paused.png