fix issue

templates/repo/modelarts/notebook/new.tmpl

@@ -59,21 +59,7 @@
                             {{end}}
                         </select>
                     </div>
-<<<<<<< HEAD
                     {{template "custom/select_dataset" .}}
-=======
-
-                    <div class="inline field">
-                        <label>{{.i18n.Tr "cloudbrain.dataset"}}</label>
-                        <input type="text" list="cloudbrain_dataset" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}" name="" id="answerInput" autofocus maxlength="36">
-                        <datalist id="cloudbrain_dataset" class="ui search" style='width:385px' name="attachment">
-                            {{range .attachments}}
-                                <option name="attachment" data-value="{{.UUID}}">{{.Attachment.Name}}</option>
-                            {{end}}
-                        </datalist>
-                        <input type="hidden" name="attachment" id="answerInput-hidden">
-                    </div>
->>>>>>> V20220328
 
                     <!--<div class="inline required field">
                         <label>工作环境</label>