From cebd459960ae2f6e7791d52815e14a8d2ef187d9 Mon Sep 17 00:00:00 2001
From: Wayne <wwayne.hsu@gmail.com>
Date: Wed, 28 Jun 2023 06:55:05 +0800
Subject: [PATCH] reset

---
 themes/vr/portal/portal.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/themes/vr/portal/portal.html b/themes/vr/portal/portal.html
index 406f7b3..093f8f6 100755
--- a/themes/vr/portal/portal.html
+++ b/themes/vr/portal/portal.html
@@ -86,10 +86,17 @@
 <p class="information">
 {$ad2s.address}<br>
 服務專線：{$ad2s.tel}</p>
+<<<<<<< HEAD
 	<div class="hidden-xs">
 		<a class="weblink" target="_blank" href="{$http}{$ad2s.domain}" title="官方網站">官方網站<em>WEB</em></a>
 		<a class="bookinglink" target="_blank" href="{$ad2s.vrmap}" title="地理位置">地理位置<em>VIEW</em></a>
 	</div>
+=======
+
+<a class="weblink" target="_blank" href="{$http}{$ad2s.domain}" title="官方網站">官方網站<em>WEB</em></a>
+<a class="bookinglink" target="_blank" href="{$ad2s.vrmap}" title="地理位置">地理位置<em>VIEW</em></a>
+
+>>>>>>> 8ad3eb3 (reset)
 </div>
 </div>  
 </div>