summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-07-10 14:44:50 -0700
committerZach Copley <zach@controlyourself.ca>2009-07-10 14:44:50 -0700
commit111aee9dc033256189a34800a7a6e11fa87aa041 (patch)
treeec655abe325591dacd5dc9f2a66c965f1fb42967
parentbafa1ab1c532118e2230df50ed18a1b4573692b7 (diff)
Fix conflict from merge with 0.7.x; remove conflict markers
-rw-r--r--README5
1 files changed, 0 insertions, 5 deletions
diff --git a/README b/README
index 40e526355..d2673a6d3 100644
--- a/README
+++ b/README
@@ -936,8 +936,6 @@ notice: A plain string that will appear on every page. A good place
to put introductory information about your service, or info about
upgrades and outages, or other community info. Any HTML will
be escaped.
-dupelimit: Time in which it's not OK for the same person to post the
- same notice; default = 60 seconds.
logo: URL of an image file to use as the logo for the site. Overrides
the logo in the theme, if any.
ssl: Whether to use SSL and https:// URLs for some or all pages.
@@ -953,15 +951,12 @@ sslserver: use an alternate server name for SSL URLs, like
shorturllength: Length of URL at which URLs in a message exceeding 140
characters will be sent to the user's chosen
shortening service.
-<<<<<<< HEAD:README
design: a default design (colors and background) for the site.
Sub-items are: backgroundcolor, contentcolor, sidebarcolor,
textcolor, linkcolor, backgroundimage, disposition.
dupelimit: minimum time allowed for one person to say the same thing
twice. Default 60s. Anything lower is considered a user
or UI error.
-=======
->>>>>>> 0.7.x:README
db
--