diff options
| author | Gareth Rees <gareth@garethrees.co.uk> | 2016-12-14 11:33:18 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@garethrees.co.uk> | 2016-12-14 11:33:18 +0000 |
| commit | 8103ae191028283bed39430888775e5059957bf9 (patch) | |
| tree | ea7b803afb9d8b7beace71bd83b4b038d2b3c084 | |
| parent | 2cddd013490c9b8f36f9439905195b0909518f98 (diff) | |
Fix incorrect conflict resolution
Missed including the <dt> in the conditional when resolving a merge conflict.
| -rw-r--r-- | lib/views/help/requesting.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index 1ef5b68..f85e817 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -269,9 +269,9 @@ you can always make the same request again via <%= site_name %>. </dd> - <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> - <% if AlaveteliConfiguration::enable_annotations %> + <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> + <dd> <p>Annotations on <%= site_name %> are to help people get the information they want, or to give them pointers to places they |