From 65cbf05f607a93f4eb34e0019035cc167e2ef032 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 31 Oct 2009 14:45:46 -0400
Subject: Revert "Revert "Added some explanatory text to README""

This reverts commit 446de62d02f372b6755237ae61e08bfcd4bf5100.

Conflicts:

	README
	htaccess.sample
---
 README | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'README')

diff --git a/README b/README
index 28f99405e..a0fb9ab0b 100644
--- 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
 =========
-- 
cgit v1.2.3-54-g00ecf