From f590c4ac2cbee2734fa7b928c20d3d1c0c8f1b5c Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Fri, 8 Jul 2016 19:20:59 +0100
Subject: [PATCH] Update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 7c815e785..caef0e940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -236,7 +236,4 @@ _Pvt_Extensions
 .fake/
 *.ncrunchproject
 *.ncrunchsolution
-<<<<<<< HEAD
-/Package.nuspec
-=======
->>>>>>> master
+