From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 interface/web/admin/templates/system_config_sites_edit.htm |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index 65f37b7..78c51b0 100644
--- a/interface/web/admin/templates/system_config_sites_edit.htm
+++ b/interface/web/admin/templates/system_config_sites_edit.htm
@@ -45,16 +45,10 @@
                     {tmpl_var name='vhost_subdomains'}&nbsp;{tmpl_var name='vhost_subdomains_note_txt'}
                 </div>
             </div>
-            <div class="ctrlHolder">
+			<div class="ctrlHolder">
                 <p class="label">{tmpl_var name='client_username_web_check_disabled_txt'}</p>
                 <div class="multiField">
                     {tmpl_var name='client_username_web_check_disabled'}
-                </div>
-            </div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='reseller_can_use_options_txt'}</p>
-                <div class="multiField">
-                    {tmpl_var name='reseller_can_use_options'}
                 </div>
             </div>
         </fieldset>
@@ -67,4 +61,4 @@
         </div>
     </div>
   
-</div>
+</div>
\ No newline at end of file

--
Gitblit v1.9.1