From 72c132a185794f1e1cc914ecb86ea7af5004efe8 Mon Sep 17 00:00:00 2001
From: zcy <zcy@xmu.edu.cn>
Date: Wed, 4 Aug 2021 09:16:12 +0800
Subject: [PATCH] no message

---
 Qss.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Qss.cpp b/Qss.cpp
index 1e18d2e..bf91185 100644
--- a/Qss.cpp
+++ b/Qss.cpp
@@ -286,13 +286,10 @@ QssMainWindow::QssMainWindow(QWidget *parent/* = 0*/, Qt::WindowFlags flags/* =
     qDebug()<<css;
     m_frame->setStyleSheet(css);
 
-<<<<<<< Updated upstream
     mShadowMask = new  QWidget(this);
     mShadowMask->setStyleSheet("QWidget{background-color:rgba(1,1,1,0.3);}");
     mShadowMask->hide();
 
-=======
->>>>>>> Stashed changes
     return;
 }