Permalink
Browse files

merge conflicts

  • Loading branch information...
2 parents f839860 + 484a1c5 commit 15342f223b9fb6f647be6e75147588caecee7158 Fravic Fernando committed Aug 8, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitignore
  2. BIN spchbrd/main.pyc
View
@@ -1 +1 @@
-*.pyc*.pyc*.pyc*.pyc*.pyc*.pyc*.pyc*.pyc
+*.pyc
View
Binary file not shown.

0 comments on commit 15342f2

Please sign in to comment.