resolve conflicts

a3ca1212 · Давид Ли · c2fc7e13 · a3ca1212
Commit a3ca1212 authored Jun 12, 2023 by Давид Ли
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

test.txt test.txt +3 -0

No files found.
--- a/test.txt
+++ b/test.txt
 hello!
 python-11 hello world
 fpdsahkpsadkhspakhpsdakhpsadhkp
+fdmgafhakshas
+dev_2
+hello world