diff --git a/.circleci/config.yml b/.circleci/config.yml index 9bc6c30a1..7deff578a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -262,7 +262,7 @@ jobs: git config --global user.email $GITHUB_USER_EMAIL git config --global user.name $GITHUB_USER_NAME git checkout published - git merge origin/dev --no-ff -m "Merge branch 'origin/dev' into published [skip ci]" + git merge origin/dev git push origin HEAD deploy-docs: docker: diff --git a/package-lock.json b/package-lock.json index 34e89a8da..d193ed4b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "calva", - "version": "2.0.171", + "version": "2.0.173", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.0.171", + "version": "2.0.173", "license": "MIT", "dependencies": { "@types/escape-html": "0.0.20", diff --git a/package.json b/package.json index 7d6e9c9cf..18475f585 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Calva: Clojure & ClojureScript Interactive Programming", "description": "Integrated REPL, formatter, Paredit, and more. Powered by cider-nrepl and clojure-lsp.", "icon": "assets/calva.png", - "version": "2.0.171", + "version": "2.0.173", "publisher": "betterthantomorrow", "author": { "name": "Better Than Tomorrow",