From a3440305b8445c2d7e814babd032e7300f483183 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Wed, 2 Jun 2021 01:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/css/style.less b/assets/css/style.less
index 705a1a0..cad44cb 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -2005,11 +2005,7 @@ page {
   z-index: 5;
   top: 0;
   /* #ifdef H5 */
-<<<<<<< HEAD
-  // top: calc(44px + env(safe-area-inset-top));
-=======
   // top: calc(0 + env(safe-area-inset-top));
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
   /* #endif */
 }