работа с дефолтами
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj
работа с дефолтами
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj
Путевой лист
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Forms/Income.dfm
	Forms/IncomeJournal.dfm
	Forms/PersonalEdit.dfm
dpr