merge conflicts

TeamFauna · Aug 8, 2012 · 15342f2 · 15342f2
2 parents f839860 + 484a1c5
commit 15342f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-*.pyc*.pyc*.pyc*.pyc*.pyc*.pyc*.pyc*.pyc
+*.pyc
diff --git a/spchbrd/main.pyc b/spchbrd/main.pyc