Resolving conflicts

mlpack · Mar 17, 2020 · 0f167ba · 0f167ba
1 parent 8012078
commit 0f167ba
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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