resolving merge conflicts
[unres.git] / git-daemon-export-ok