Revert "Revert "Added some explanatory text to README""

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 28f99405e32d1c42fa533a60f0bc634eedf34881..a0fb9ab0b29fa6a9dbdb0249f5cdacedccff7906 100644 (file)
--- a/README
+++ b/README
@@ -688,9 +688,13 @@ 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
 =========