8000 Resolve rebase conflicts · python/python-docs-el@0477109 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0477109

Browse files
skpanagiotisskpanagiotis
committed
Resolve rebase conflicts
1 parent e474935 commit 0477109

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

‎dictionaries/main.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,8 @@ expat
181181
expressions
182182
extension
183183
f
184-
<<<<<<< HEAD
185184
false
186-
=======
187185
fatal
188-
>>>>>>> Add words in main.txt
189186
finder
190187
finders
191188
first

0 commit comments

Comments
 (0)
0