remove leftover git conflict marker

2019-10-26 03:08:33 +07:00 · 2019-10-26 03:08:33 +07:00 · 11b258c71c
parent 5fcd6e31eb
commit 11b258c71c
1 changed files with 0 additions and 1 deletions
--- 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)