From f17016470170401e1ad1b869c740063a578cb4cd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 22 Dec 2009 08:53:20 -0800 Subject: remove some merge cruft from README --- README | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README b/README index dc2e2b4ba..4dc3b02a8 100644 --- a/README +++ b/README @@ -697,13 +697,9 @@ to users on a remote site. (Or not... it's not well tested.) The If fancy URLs is enabled, access to file attachments can also be restricted to logged-in users only. Uncomment the appropriate rewrite -<<<<<<< HEAD:README rule in .htaccess or your server's httpd.conf. (This most likely will not work if you are using a virtual server for attachments, so consider the performance/security tradeoff.) -======= -rule in .htaccess or your server's httpd.conf. ->>>>>>> 446de62... Revert "Added some explanatory text to README":README Upgrading ========= -- cgit v1.2.3-54-g00ecf