From b4f585b0b5ef720639208c6e7e3c35d9222a064e Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 19 Jan 2016 16:24:47 +0100
Subject: [PATCH] Add orig files from merge tools to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4848da2f4..369dee800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.bak
 *.iml
 *.log
+*.orig
 .*.sw?
 .classpath
 .directory
-- 
GitLab