Skip to content
Permalink
Browse files

Resolving conflicts

  • Loading branch information
himanshupathak21061998 committed Mar 12, 2020
1 parent 8012078 commit 0f167ba693c24b3aeafdae805fda3f95d0bc9256
Showing with 0 additions and 4 deletions.
  1. +0 −4 .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

0 comments on commit 0f167ba

Please sign in to comment.
You can’t perform that action at this time.