Fixed: github.com key auth.

developersdo · Oct 24, 2018 · 0495d2c · 0495d2c
1 parent 060d801
commit 0495d2c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,7 +33,10 @@ jobs:
               git config --global user.email $GH_EMAIL
               git config --global user.name $GH_NAME
 
+<<<<<<< HEAD
               touch ~/.ssh/known_hosts
+=======
+>>>>>>> Fixed: github.com key auth.
               ssh-keyscan github.com >> ~/.ssh/known_hosts
 
               git clone $CIRCLE_REPOSITORY_URL out
@@ -67,7 +70,10 @@ jobs:
               git config --global user.email $GH_EMAIL
               git config --global user.name $GH_NAME
 
+<<<<<<< HEAD
               touch ~/.ssh/known_hosts
+=======
+>>>>>>> Fixed: github.com key auth.
               ssh-keyscan github.com >> ~/.ssh/known_hosts
 
               npm run refresh