Merge branch 'dev' into 814-connect-without-project

BetterThanTomorrow · Feb 13, 2021 · 28b8fa0 · 28b8fa0
2 parents 1fbe5f3 + 3d54824
commit 28b8fa0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
diff --git 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",