reset
This commit is contained in:
parent
e2b7e04f59
commit
cebd459960
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user