From b2c1a34a98058ff2586bad31a537c087789c4b4a Mon Sep 17 00:00:00 2001
From: maste9 <maste9@gmail.com>
Date: Sat, 14 Feb 2015 23:53:03 +0100
Subject: [PATCH] tell .gitignore not to commit .txt files

---
 .gitignore | 183 -----------------------------------------------------
 1 file changed, 183 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1be6fa7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,183 +0,0 @@
-<<<<<<< HEAD
-# ---> Python
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-=======
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
->>>>>>> Initial commit
-
-# Emacs backup and lock files
-*~
-\#*\#
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-<<<<<<< HEAD
-=======
-env/
->>>>>>> Initial commit
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-<<<<<<< HEAD
-.eggs/
-=======
->>>>>>> Initial commit
-lib/
-lib64/
-parts/
-sdist/
-var/
-<<<<<<< HEAD
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-=======
-*.egg-info/
-.installed.cfg
-*.egg
->>>>>>> Initial commit
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-<<<<<<< HEAD
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-=======
-.coverage
-.cache
-nosetests.xml
-coverage.xml
->>>>>>> Initial commit
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-<<<<<<< HEAD
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-=======
->>>>>>> Initial commit
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-<<<<<<< HEAD
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# ---> WebMethods
-**/IntegrationServer/datastore/
-**/IntegrationServer/db/
-**/IntegrationServer/DocumentStore/
-**/IntegrationServer/lib/
-**/IntegrationServer/logs/
-**/IntegrationServer/replicate/
-**/IntegrationServer/sdk/
-**/IntegrationServer/support/
-**/IntegrationServer/update/
-**/IntegrationServer/userFtpRoot/
-**/IntegrationServer/web/
-**/IntegrationServer/WmRepository4/
-**/IntegrationServer/XAStore/
-**/IntegrationServer/packages/Wm*/
-
-=======
->>>>>>> Initial commit