summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPaulo Henrique Silva <ph.silva@gmail.com>2016-11-16 23:54:09 -0200
committerGitHub <noreply@github.com>2016-11-16 23:54:09 -0200
commit521fe89150c6aaa0ff0954cc8d32e4b6f8009324 (patch)
tree59cef68f1449a5be8d2a9a8ed352e3d9974a3edb /.gitignore
parent7030eee5e28180732c5cf98aeda4b66657223870 (diff)
parent1e868763a1c4030bedd51553468cbe25f272bef9 (diff)
downloadgerbonara-521fe89150c6aaa0ff0954cc8d32e4b6f8009324.tar.gz
gerbonara-521fe89150c6aaa0ff0954cc8d32e4b6f8009324.tar.bz2
gerbonara-521fe89150c6aaa0ff0954cc8d32e4b6f8009324.zip
Merge pull request #58 from garretfick/merge-curtacircuitos
Epic merge from @garretfick Thanks a lot @garretfick and @hamiltonkibbe.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7c3daa0..a3ffb1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,10 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
+.idea/workspace.xml
+.idea/misc.xml
.idea
+.settings
# Komodo Files
*.komodoproject
@@ -42,3 +45,6 @@ nosetests.xml
# OS Files
.DS_Store
Thumbs.db
+
+# Virtual environment
+venv