From 1e41b796110762344b0181f3578ec96ab09bdde1 Mon Sep 17 00:00:00 2001
From: wangyong <864072399@qq.com>
Date: Sun, 15 Nov 2015 23:29:31 +0800
Subject: [PATCH] fix merge bug

---
 templates/jasset/asset_add.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/templates/jasset/asset_add.html b/templates/jasset/asset_add.html
index 53d7dd0b2..1d8eacc28 100644
--- a/templates/jasset/asset_add.html
+++ b/templates/jasset/asset_add.html
@@ -41,6 +41,7 @@
                                     {% endif %}
 
                                     <form id="assetForm" method="post" class="form-horizontal">
+
                                         {{ af.ip|bootstrap_horizontal }}
 
                                         <div class="hr-line-dashed"></div>
@@ -61,12 +62,6 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group" id="port" style="display: none">
-                                            <label class="col-sm-2 control-label"> 端口号<span class="red-fonts">*</span> </label>
-                                            <div class="col-sm-8">
-                                                <input type="text" placeholder="Port" name="port" class="form-control">
-                                            </div>
-                                        </div>
                                         <div class="form-group" id="admin_account" style="display: none">
                                             <label class="col-sm-2 control-label"> 管理用户名<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-3">