From ae24301210daff35e5fc93313d8d4c13890fa0df Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Fri, 12 Aug 2016 18:55:04 -0400
Subject: Revert "Bug 1292907 - Create custom Name Clearance form"

This reverts commit 1514a2ad792751120d5010a14d78575cb6c1a969.
---
 .../en/default/bug/create/user-message.html.tmpl         | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'extensions/BMO/template/en/default/bug/create/user-message.html.tmpl')

diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index e01ac4845..1612f98b3 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -9,20 +9,18 @@
 [% PROCESS global/variables.none.tmpl %]
 
 <p>
-  [% UNLESS cloned_bug_id || no_guided_bug_link %]
+  [% UNLESS cloned_bug_id %]
     Consider using the
     <a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided"
     ><img src="extensions/BMO/web/images/guided.png" width="16" height="16" align="absmiddle" border="0">
     [%+ terms.Bugzilla %] Helper</a> instead of this form.
   [% END +%]
-  [% UNLESS no_bug_guidelines %]
-    Before reporting a [% terms.bug %], make sure you've read our
-    <a href="https://developer.mozilla.org/en/Bug_writing_guidelines">
-    [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
-    been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi">
-    most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
-    search through descriptions</a> of previously reported [% terms.bugs %].
-  [% END %]
+  Before reporting a [% terms.bug %], make sure you've read our
+  <a href="https://developer.mozilla.org/en/Bug_writing_guidelines">
+  [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
+  been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi">
+  most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
+  search through descriptions</a> of previously reported [% terms.bugs %].
 </p>
 
 [%
-- 
cgit v1.2.3-24-g4f1b