summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 08:18:18 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 08:18:18 +0200
commita72fd280f7acb4d2a1ba579a0f1b2b2ae8958530 (patch)
tree5f9304028b45e74fd0609203c19c53b70daecd11 /.gitignore
parentf6d65e533c62f6deb21342d4901ece24497b433e (diff)
Remove left over from merge
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ead387eb..c8d614a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
.svn
*~
+*.orig
+*.rej
*.kate-swp
.classpath
.idea