From bd2d8479d90bd732a8370a694061049d73944132 Mon Sep 17 00:00:00 2001
From: lbrdnk <lbrdnk@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:32:41 +0200
Subject: [PATCH] Revert "Add :legacy/merge-indents? to .cljfmt.edn (#47345)"
 (#47357)

This reverts commit 3759c8d46a9dd1b75a3bf84eb3e3a02878033e1c.
---
 .cljfmt.edn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.cljfmt.edn b/.cljfmt.edn
index fe256a90326..17cf420dc13 100644
--- a/.cljfmt.edn
+++ b/.cljfmt.edn
@@ -1,9 +1,5 @@
 ;; Cljfmt config. See https://github.com/weavejester/cljfmt#formatting-options
-{;; Following option is required for cljfmt to run correctly in vscode/calva.
- ;; Source: https://calva.io/formatting/#indentation-rules
- :legacy/merge-indents? true
- 
- :sort-ns-references?
+{:sort-ns-references?
  true
 
  :function-arguments-indentation
-- 
GitLab