From bffbd6a2b161673913b5069dd90e2e328e2d1ad9 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 20 Jul 2020 17:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/PromoteCompany/edit.html | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 233ba26dd..88d15b3da 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -285,16 +285,7 @@
                         <tr>
                             <td class="l">备注：</td>
                             <td class="r" >
-<<<<<<< HEAD
                                 <input type="text" class="txt " name="content" value="{$data.content}" placeholder="">
-=======
-                                <select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
-                                    <option value="0">请选择开发类型</option>
-                                    <option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
-                                    <option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
-                                    <option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>
-                                </select>
->>>>>>> 574ade1b91ebddf68f767ca63adb31b1c5a4ffaf
                             </td>
                         </tr>
                         <tr>