fix: merge with online modif

5 years ago · 81beee7f0b
1 changed files with 6 additions and 0 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -2,9 +2,15 @@ version: 2.1
 jobs:
  build:
    docker:
 <<<<<<< HEAD
      - image: cimg/node
        auth:
          username: Anatole-DC
 =======
      - image: cimg/node:16.10.0
        auth:
          username: adechauveron
 >>>>>>> efd5113c2cef6d5b080a3741d5c06527be1056cc
          password: $DOCKER_PASSWORD
    steps: