From 823f297ae6e92f987ffa791f9e72f17afdbb913d Mon Sep 17 00:00:00 2001
From: Stefan Forsberg <cykelkatalogen@popkram.com>
Date: Wed, 20 Mar 2013 10:25:44 +0100
Subject: [PATCH] Added merge files to gitignore

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

diff --git a/.gitignore b/.gitignore
index 0a211aa..fe9840b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+*.orig
+
 # User-specific files
 *.suo
 *.user