]> granicus.if.org Git - apache/commit
Resolve conflicts after import.
authorRalf S. Engelschall <rse@apache.org>
Fri, 4 May 2001 22:07:34 +0000 (22:07 +0000)
committerRalf S. Engelschall <rse@apache.org>
Fri, 4 May 2001 22:07:34 +0000 (22:07 +0000)
commit07e51cc45d53965ddac3d8e062338e07ba474ec6
treebeac8a5aaf821506a6a73437cd8bab3aafefb50f
parentf83672781de25207442ff908258219de1d103062
Resolve conflicts after import.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88994 13f79535-47bb-0310-9956-ffa450edef68
modules/ssl/.cvsignore
modules/ssl/.indent.pro [deleted file]