GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

remove some merge cruft from README

This commit is contained in:
Evan Prodromou 2009-12-22 08:53:20 -08:00
parent 51838a969b
commit f170164701
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -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 If fancy URLs is enabled, access to file attachments can also be
restricted to logged-in users only. Uncomment the appropriate rewrite 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 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 not work if you are using a virtual server for attachments, so consider
the performance/security tradeoff.) the performance/security tradeoff.)
=======
rule in .htaccess or your server's httpd.conf.
>>>>>>> 446de62... Revert "Added some explanatory text to README":README
Upgrading Upgrading
========= =========