clean .gitignore

This commit is contained in:
Dimitris Zlatanidis 2015-02-24 21:02:06 +02:00
parent 9c9be6b514
commit a49fae0225

4
.gitignore vendored
View file

@ -6,7 +6,3 @@ __pycache__
*.egg-info/
/slpkg_Build
.ropeproject/
<<<<<<< HEAD
=======
>>>>>>> master