Remove filename from conflict markers
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 606475f3178784e5a6b3a01dce1a54314345cf43)
-rw-r--r-- 850 apache.conf
-rw-r--r-- 227 ssl.cnf