Resolved merge conflicts2

python · skpanagiotis · Feb 25, 2025 · Feb 19, 2025 · Feb 19, 2025 · Feb 19, 2025
commit bbf39b429e18d7044f6574362a9549957bacf3b7
diff --git a/dictionaries/main.txt b/dictionaries/main.txt
@@ -252,6 +252,10 @@ chomp
 class
 classname
 clear
+close
+closed
+clossure
+cls
 cmath
 code
 codec
@@ -502,6 +506,11 @@ messages
 meta
 meth
 method
+min
+mixin
+mixins
+mkdir
+mm
 mod
 mode
 module
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,6 +252,10 @@ chomp @@
     class
     classname
     clear
+    close
+    closed
+    clossure
+    cls
     cmath
     code
     codec
@@ Expand Down Expand Up / @@ -502,6 +506,11 @@ messages @@
     meta
     meth
     method
+    min
+    mixin
+    mixins
+    mkdir
+    mm
     mod
     mode
     module
@@ Expand Down @@