ignore

TitusLVR · Nov 8, 2019 · d1bc176 · d1bc176
1 parent 9dddcc7
commit d1bc176
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,30 +1,15 @@
-<<<<<<< HEAD
-# Byte-compiled / optimized / DLL files
-
-=======
-
 /__pycache__
 *.py[cod]
 
-# Byte-compiled / optimized / DLL files
->>>>>>> 556b7fca844de37624045afeaadb4a7b4e4e9e34
-__pycache__/
-*.py[cod]
-
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
 
 # Bookmarks file and recents
 config/bookmarks.txt
 config/recent-files.txt
-<<<<<<< HEAD
 
 # VSCode
 .vscode/*
-
-
-
-=======
 *.code-workspace
->>>>>>> 556b7fca844de37624045afeaadb4a7b4e4e9e34
+
diff --git a/__pycache__/__init__.cpython-37.pyc b/__pycache__/__init__.cpython-37.pyc