From 90b87a3e9af8e89a56c2d1b04e63751bbceded65 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Jul 2020 16:56:45 +0800
Subject: [PATCH] build

---
 src/forge/Merge/UpdateMerge.js | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index 509593a4..eb20dcf8 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -63,22 +63,12 @@ class UpdateMerge extends Component {
               <div>
                 <div className="merge-header width100 inline-block">
                   <div className="width45 pull-left">
-<<<<<<< HEAD
-                    <div className="color-grey-3 mb10 fwb"> 源分支: </div>{" "}
-                    <Input.Group compact className="display-flex">
-                      <Button className="merge-header-button maxW50 hide-1 task-hide">
-                        {" "}
-                        {data && data.project_author}/{" "}
-                        {data && data.project_name}{" "}
-                      </Button>{" "}
-=======
                     <div className="color-grey-3 mb10 fwb">源分支:</div>
 
                     <Input.Group compact className="display-flex">
                       <Button className="merge-header-button maxW50 hide-1 task-hide">
                         {data.is_original ? `${data.fork_project_user_name}/${data.fork_project_identifier}` : `${data.project_author}/${data.project_name}`}
                       </Button>
->>>>>>> newVersion_forge
                       <Select
                         defaultValue={data.is_original ? `${data.fork_project_user}:${pull}` : `${pull}`}
                         className="minW50 merge-flex1"
@@ -96,15 +86,8 @@ class UpdateMerge extends Component {
                       <div className="color-grey-3 mb10 fwb"> 目标分支 : </div>{" "}
                       <Input.Group compact className="display-flex">
                         <Button className="merge-header-button  maxW50 hide-1 task-hide">
-<<<<<<< HEAD
-                          {" "}
-                          {data && data.project_author}/{" "}
-                          {data && data.project_name}{" "}
-                        </Button>{" "}
-=======
                           {`${data.project_author}/${data.project_name}`}
                         </Button>
->>>>>>> newVersion_forge
                         <Select
                           defaultValue={data.is_original ? `${data.project_login}:${merge}` : `${merge}`}
                           className="minW50 merge-flex1"
@@ -124,23 +107,12 @@ class UpdateMerge extends Component {
               </div>
             ) : (
               ""
-<<<<<<< HEAD
-            )}{" "}
-          </Spin>{" "}
-        </div>{" "}
-        <div className=" main">
-          <MergeFooter footer_type="new" {...this.props}>
-            {" "}
-          </MergeFooter>{" "}
-        </div>{" "}
-=======
             )}
           </Spin>
         </div>
         {/* <div className=" main">
           <MergeFooter footer_type="new" {...this.props}></MergeFooter>
         </div> */}
->>>>>>> newVersion_forge
       </div>
     );
   }