From 21b41f302ed0fb649994924472a5803cbcb8264e Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 8 Jul 2016 19:12:31 +0100
Subject: [PATCH] =?UTF-8?q?stupid=20&$(*=C2=A3=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
index 1403c49ec..3cc952b53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,5 +234,5 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
-*.ncrunchproject
-*.ncrunchsolution
+*.ncrunchproject
+*.ncrunchsolution