From a72fd280f7acb4d2a1ba579a0f1b2b2ae8958530 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 08:18:18 +0200
Subject: Remove left over from merge

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitignore')

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
-- 
cgit v1.2.2