Merge branch 'master' of B:\www\gamer\htdocs with conflicts.
Закончил раздел о нас
Merge remote-tracking branch 'origin/master'