From 6dcdc0640593f06de73387541486ab07f0731f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henri=20Hyyryl=C3=A4inen?= <henri.hyyrylainen@gmail.com>
Date: Tue, 16 Aug 2016 17:12:55 +0300
Subject: [PATCH] Added .orig to gitignore to ignore left over files from merge
 tool

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

diff --git a/.gitignore b/.gitignore
index 38eeab44b65..750cd37ddd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@ assets/*
 /sounds
 /videos
 
+# Merge tool left over files
+*.orig
+
 # Website directory
 
 website/*