Всё в порядке.
Merge commit 'ce59c8a215fe5bd6baa8de0cdf9f04951f4c4dc9' into Параметры_запуска_файла

Conflicts:
	OOP_V0/Application.cpp
	OOP_V0/Print.cpp
Merge branch 'master' of https://github.com/MadPigeon/Sorts_oop_lab

Conflicts:
	OOP_V0/Application.cpp
	OOP_V0/Print.cpp