Merge remote-tracking branch 'origin/master'

# Conflicts: # test.txt

Merge remote-tracking branch 'origin/master'
# Conflicts: # test.txt
0a3cd409 · Алексей Милосердов · bce818ae · 173db37c · 0a3cd409
Commit 0a3cd409 authored Mar 02, 2022 by Алексей Милосердов
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

test.txt test.txt +2 -1

No files found.
--- a/test.txt
+++ b/test.txt
 asdasdasdasdasd
-Добавил я сам
\ No newline at end of file
+Добавил я сам
+Добавил кто то другой
\ No newline at end of file