Resolved merge conflicts

2023-12-10 12:36:57 +01:00
parent 3734a803dc 9fdf7a90af
commit 7f04ca94f6
5 changed files with 34 additions and 7 deletions
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -133,3 +133,4 @@ viml
 config
 confformat
 plugbench
+jedec