From b25d7f0d9f8a092c326f7ae9b1f9e558ae5d0459 Mon Sep 17 00:00:00 2001
From: zjj <zjjhot@hotmail.com>
Date: Thu, 28 Mar 2024 11:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=A4=84=E7=90=86=E4=B8=80?=
 =?UTF-8?q?=E5=A4=84=E5=86=B2=E7=AA=81=E3=80=82=E3=80=82=E3=80=82=20=20NIS?=
 =?UTF-8?q?U?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/repo/wiki/view.tmpl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 12aca90f409e..4d279faa34b2 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -28,12 +28,8 @@
 					</div>
 				</div>
 			</div>
-<<<<<<< HEAD
 			        <!--Hide wiki view clone button-->
-			<div class="ui action small input gt-df gt-ac" style="display: none" id="clone-panel">
-=======
-			<div class="clone-panel ui action small input">
->>>>>>> giteaofficial/main
+			<div class="clone-panel ui action small input" style="display: none">
 				{{template "repo/clone_buttons" .}}
 				{{template "repo/clone_script" .}}
 			</div>