Устранил конфликты

8ab585cb · Давид Ли · 3144e753 · 86e65508 · 8ab585cb
Commit 8ab585cb authored Jun 12, 2023 by Давид Ли
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test.txt test.txt +1 -1

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