Merge branch 'master' of https://github.com/PokestarFan/DuplicateBot

PokestarFan · PokestarFan · commit 7983307d3890 · 2017-09-07T18:04:27.000-04:00
# Conflicts:
#	.gitignore
diff --git a/.gitignore b/.gitignore
@@ -103,10 +103,7 @@ ENV/
 #my login
 login.py
 
-#pycharm
-.idea/
-
 #files used by program
 blockusers.txt
 posts_written_to.txt
-writes.txt
+writes.txt
