优化ok

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>