From 47ac17d96238eee970b47559044f0e1473292ae6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Nov 2016 18:03:24 +0530
Subject: [PATCH] Fix conflicts in appveyor.yml

---
 appveyor.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 449f5ae986..9efa153e3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,13 +8,6 @@ branches:
     - vs2015
 
 cache:
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    - node_modules
->>>>>>> Start work on setting up CO testing on windows with AppVeyor
-=======
->>>>>>> Add AppVeyor badge
     - .build-cache
 
 environment: