Skip to content

Commit bbf39b4

Browse files
committed
Resolved merge conflicts2
1 parent 177dd5a commit bbf39b4

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

dictionaries/main.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ chomp
252252
class
253253
classname
254254
clear
255+
close
256+
closed
257+
clossure
258+
cls
255259
cmath
256260
code
257261
codec
@@ -502,6 +506,11 @@ messages
502506
meta
503507
meth
504508
method
509+
min
510+
mixin
511+
mixins
512+
mkdir
513+
mm
505514
mod
506515
mode
507516
module

0 commit comments

Comments
 (0)