]> granicus.if.org Git - apache/commit
Oops. Something went wrong with the merge.
authorMladen Turk <mturk@apache.org>
Tue, 25 Jul 2006 15:29:32 +0000 (15:29 +0000)
committerMladen Turk <mturk@apache.org>
Tue, 25 Jul 2006 15:29:32 +0000 (15:29 +0000)
commit3c957a9d915b1cd3335920494e740691134390bb
treeccb560d51ddf8e552e1c70c0d67fc078dd9c021b
parent11e590efd85fa6dfc391de82989eef2c551f45d1
Oops. Something went wrong with the merge.
Use the original ~nf.default.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425423 13f79535-47bb-0310-9956-ffa450edef68
Makefile.win