Resolve rebase conflicts

skpanagiotis · skpanagiotis · commit 0477109e7ffd · 2024-10-02T11:43:36.000+03:00
diff --git a/dictionaries/main.txt b/dictionaries/main.txt
@@ -181,11 +181,8 @@ expat
 expressions
 extension
 f
-<<<<<<< HEAD
 false
-=======
 fatal
->>>>>>> Add words in main.txt
 finder
 finders
 first
