summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-05 19:24:29 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-05 19:24:29 +0200
commit81184b836a6ddbeaca5f85781a052cb36424e37f (patch)
tree1965bd34b4e351e5148a1412e618555b72330117 /.gitignore
parent67d0ce65dc6a1d240e271a7cd479b60aa1dc2967 (diff)
parentc1f7a0251136f6327d14a85eb5a761489551b668 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0ff0ae9..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.pc
-debian/files