-
1234
коментарий
новая1
удаление функции
-2
Merge remote-tracking branch 'origin/new_f2' into new_f

Conflicts:
	kurs/Project1.exe
	kurs/Unit1.dcu
Merge remote-tracking branch 'origin/delphi' into new_f2

Conflicts:
	kurs/Unit1.~pas
Merge remote-tracking branch 'origin/new_f2'

Conflicts:
	kurs/Project1.dpr
--изменения1
--изменения1
Merge remote-tracking branch 'origin/master' into delphi
Merge remote-tracking branch 'origin/master' into delphi

Conflicts:
	kurs/Project1.dpr