Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 9e91ad674d6d76d229aae629daf1e07a7a3d1863..6e39890cbff9fb0ebb6286cdaceee3f417f88a59 100644 (file)
--- a/README
+++ b/README
@@ -712,13 +712,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
 =========