summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-08-11 05:41:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-08-11 05:41:58 +0200
commit775e974b25e1c055ecaba84c50e1fed12e57a82d (patch)
tree88dc9473cc4e7efedad44682b1eb2e54d1e3e7c2 /.gitignore
parent2cf54f179c9411b11dabe00f5c831245fbb7a622 (diff)
parente21453143818389060bf0bd6cfa627c11a63ede5 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index f945b3b..4ccd411 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,4 @@
/*.txt
*~
*.pyc
-.pc