diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-22 08:53:20 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-22 08:53:20 -0800 |
| commit | f17016470170401e1ad1b869c740063a578cb4cd (patch) | |
| tree | a96c2dca4bc0b647b82e0dbca15e3a9ecbd632a7 | |
| parent | 51838a969b51c43e04c5ed16a6ada7eb0e589fd8 (diff) | |
remove some merge cruft from README
| -rw-r--r-- | README | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 ========= |