Merge branch 'master' of C:\OpenServer\domains\child with conflicts.
Удаление REadme
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Виджеты
Тестовый
Merge remote-tracking branch 'origin/master'
Тестовый
Тестовый
Тестовый