Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fucking merge conflict I never took care of

  • Loading branch information...
commit 84aeabc2d435d6ee5383b00c8b4e294a55057a11 1 parent ce41ec9
Abe Stanway authored
Showing with 0 additions and 5 deletions.
  1. +0 −5 .gitignore
View
5 .gitignore
@@ -1,11 +1,6 @@
opendb.php
key.p12
-<<<<<<< HEAD
twitter_auth.py
-=======
dbauth.py
dbauth.pyc
->>>>>>> 481332875ceb31b7b690c35e967e456ba07cc0ae
-
-# OS X Specific
.DS_Store
Please sign in to comment.
Something went wrong with that request. Please try again.