summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README4
1 files changed, 0 insertions, 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
=========