summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2020-10-02 12:52:14 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2020-10-02 12:52:14 +0200
commit5d5c46d6c3fa968db26eb1b7e49d823023a846c1 (patch)
tree7dfcab59a1726ac8707052dca7ed056ad012ac23 /.gitignore
parentd8bc1ccd39986f9b8af066636921f91667dc2492 (diff)
parent522d8280cf95f43ca6d5904ae5d79a9a9c502af3 (diff)
Merge branch 'janis' into merge-prep/janis
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 25b1be5..91b6250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.pyc
/htmlcov/
/.coverage*
+.idea/