fix typo

PennLINC · Apr 13, 2022 · ad06d0e · ad06d0e
1 parent 1876e54
commit ad06d0e
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,22 +27,13 @@ jobs:
             conda info -a
             conda create -n flywheel python=3.7
             source activate flywheel
-<<<<<<< HEAD
-
             # Add nodejs and the validator
             mkdir -p /tmp/validator
             sudo apt update
             sudo apt install nodejs npm
             sudo npm install -g yarn --unsafe-perm=true --allow-root
             sudo npm install -g bids-validator --unsafe-perm=true --allow-root
             # install fw cli https://storage.googleapis.com/flywheel-dist/cli/14.4.4/fw-linux_amd64-14.4.4.zip
-=======
-            #conda install -c conda-forge -y datalad
-            # Add nodejs and the validator
-            conda install nodejs
-            npm install -g yarn && \
-            npm install -g [email protected]
->>>>>>> 451d0170cd190ca6cceb86def6dc51bc45a73802
             cd /tmp
             mkdir -p /tmp/fw_cli && \
             cd /tmp/fw_cli