solve conflict

templates/repo/cloudbrain/new.tmpl

@@ -22,19 +22,6 @@
 {{template "custom/global_mask" .}}
 <div class="repository">
     {{template "repo/header" .}}
-<<<<<<< HEAD
-    <div class="repository new repo ui middle very relaxed page grid">
-        <div class="column">
-            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-queue="{{.QueuesDetail}}" 
-                data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}" data-exceed-size="{{DebugAttachSize}}"></div>
-            {{if eq .NotStopTaskCount 0}}
-                {{template "base/alert" .}}
-            {{end}}
-            <div class="ui negative message" id="messageInfo" style="display:none;">
-                <p></p>
-            </div>
-            {{template "custom/alert_cb" .}}
-=======
     <div class="ui container">
         <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}" data-flag-model="true"></div>
         {{if eq .NotStopTaskCount 0}}
@@ -48,7 +35,6 @@
         </h4>
         {{template "custom/alert_cb" .}}
         <div class="ui attached segment">
->>>>>>> V20221214
             <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name='isBranches' value="{{.Branches}}">

templates/repo/modelarts/notebook/new.tmpl

@@ -2,18 +2,6 @@
 {{template "custom/global_mask" .}}
 <div class="repository">
     {{template "repo/header" .}}
-<<<<<<< HEAD
-    <div class="repository new repo ui middle very relaxed page grid">
-        <div class="column">
-            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-exceed-size="{{DebugAttachSize}}"></div>
-            {{if eq .NotStopTaskCount 0}}
-                {{template "base/alert" .}}
-            {{end}}
-            <div class="ui negative message" id="messageInfo" style="display: none;">
-                    <p></p>
-            </div>
-            {{template "custom/alert_cb" .}}
-=======
     <div class="ui container">
         
         <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true"></div>
@@ -28,7 +16,6 @@
             {{.i18n.Tr "repo.modelarts.train_job.new_debug"}}
         </h4>
         <div class="ui attached segment">
->>>>>>> V20221214
             <form class="ui form" id="form_id" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <!-- <br> -->