From 11b258c71c35dec6d9228f01b68eae1987c9bca0 Mon Sep 17 00:00:00 2001 From: Muneeb Shaikh Date: Sat, 26 Oct 2019 03:08:33 +0700 Subject: [PATCH] remove leftover git conflict marker --- CHANGELOG.develop | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index ba0d3757a..e52145313 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1242,7 +1242,6 @@ Other: - Improved spacemacs-jump-handlers (thanks to Ag Ibragimov) - Autoscroll to end of REPL when sending buffer content (thanks to Vitaly Banchenko) - Added ability to use multiple linters together (thanks to didibus) ->>>>>>> fa4786d5a... [clojure] Added support for joker linter and having mutliple active linters - Key bindings: - ~SPC m e ;~ to eval sexp and show result as comment (thanks to John Stevenson)