From 696eefb7acac813f041b503a9037dd02d26c2223 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Tue, 4 Oct 2016 17:02:53 +0200
Subject: [PATCH] ignore merge conflict backup files

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

diff --git a/.gitignore b/.gitignore
index 226322e..ee164ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ xml/PenText.xpr
 *.pyc
 
 .DS_Store
+*.orig