branch: scratch/editorconfig
commit b07e8a5f2095d6e54a9fabc2265f91914b2d0edc
Merge: 583bcb13df 1651294334
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Merge remote-tracking branch 'refs/remotes/origin/elpa/editorconfig' into
elpa/editorconfig
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c34f20a89..c07395a278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0
- Support new major-modes
- svelte-mode ([#333])
- magik-mode, magik-ts-mode ([#336])
-- Add switch not to override local variable values ([#338])
+- Add switches not to override local variable values ([#338])
- Set `editorconfig-override-file-local-variables` to nil to use file local
variable values instead of values in .editorconfig
- Set `editorconfig-override-dir-local-variables` to nil to use values
defined in
