Merge branch 'dev' into 'dev_2'

# Conflicts: # test.txt

Merge branch 'dev' into 'dev_2'
# Conflicts: # test.txt
5ced082b · Давид Ли · e957d006 · 59bd128a · 5ced082b
Commit 5ced082b authored Jun 12, 2023 by Давид Ли
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

test.txt test.txt +2 -2

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