Vocabulary, resolved merge conflict

2025-12-06 21:45:10 +01:00 · 2018-07-14 11:30:16 +02:00
parent 4f6e0c29be
commit 20f0e2f05a
2 changed files with 2 additions and 3 deletions
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -75,8 +75,7 @@ Hoenderloo
 Garmin
 Termux
 varkenssaté
-<<<<<<< HEAD
 e-reader
-=======
 tomatenplant
->>>>>>> 6242ca7a686cfbb12f478747f8d5bb52845f6a4c
+macarons
+bijgekletst
--- a/.vim/spell/nl.utf-8.add.spl
+++ b/.vim/spell/nl.utf-8.add.spl