From 7397696b773efd3e8e59b7b8f44f0bcbb60d4e06 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 8 Sep 2021 11:38:07 +0800
Subject: [PATCH] fix conflicts

---
 templates/repo/modelarts/new.tmpl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/templates/repo/modelarts/new.tmpl b/templates/repo/modelarts/new.tmpl
index f9ea86428..6020d45e6 100755
--- a/templates/repo/modelarts/new.tmpl
+++ b/templates/repo/modelarts/new.tmpl
@@ -117,12 +117,7 @@
                         <input type="text" list="cloudbrain_dataset" placeholder="选择数据集" name="" id="answerInput" autofocus maxlength="36">
                         <datalist id="cloudbrain_dataset" class="ui search" style='width:385px' name="attachment">
                             {{range .attachments}}
-<<<<<<< HEAD
-                                <option name="attachment" data-value="{{.UUID}}">{{.Attachment.Name}}</option>
-
-=======
                                 <option name="attachment" value="{{.UUID}}">{{.Attachment.Name}}</option>
->>>>>>> 14902388b9cc70d0ee65d1f67f1e6cd9d26053cb
                             {{end}}
                         </datalist>
                         <input type="hidden" name="attachment" id="answerInput-hidden">