From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/dns/templates/dns_wizard.htm |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 849c5b4..da2c918 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -67,6 +67,11 @@
                     <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
                 </div>
             </tmpl_if>
+            <tmpl_if name="DKIM_VISIBLE">
+		    <label for="dkim">{tmpl_var name='dkim_txt'}</label>
+                    <input name="dkim" type="hidden" maxlength="255" type="text"/>
+            </tmpl_if>
+
         </fieldset>
             
         <input type="hidden" name="create" value="0" />

--
Gitblit v1.9.1