From 0f167ba693c24b3aeafdae805fda3f95d0bc9256 Mon Sep 17 00:00:00 2001
From: himanshupathak21061998 <hpathak336@gmail.com>
Date: Thu, 12 Mar 2020 22:53:51 +0530
Subject: [PATCH] Resolving conflicts

---
 .ci/windows-steps.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.ci/windows-steps.yaml b/.ci/windows-steps.yaml
index dab34846972..26cd2c0ff43 100644
--- a/.ci/windows-steps.yaml
+++ b/.ci/windows-steps.yaml
@@ -28,11 +28,7 @@ steps:
 # Configure armadillo
 - bash: |
     git clone --depth 1 https://github.com/mlpack/jenkins-conf.git conf
-<<<<<<< HEAD
 
-=======
-    
->>>>>>> Adding changes in documentation
     curl -O http://masterblaster.mlpack.org:5005/armadillo-8.400.0.tar.gz -o armadillo-8.400.0.tar.gz
     tar -xzvf armadillo-8.400.0.tar.gz