From d2f9d5447463e6ebc4723ed014fc781d8ddcfeb4 Mon Sep 17 00:00:00 2001
From: wacj1425 <wacj1425@163.com>
Date: Sun, 25 Apr 2021 16:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Filesystem.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Filesystem.php b/src/Filesystem.php
index a5ad9df..6ab85fd 100644
--- a/src/Filesystem.php
+++ b/src/Filesystem.php
@@ -2,10 +2,7 @@
 
 namespace thans\filesystem;
 
-<<<<<<< HEAD
 use InvalidArgumentException;
-=======
->>>>>>> dad577fc6bb356e0e3075795ebcbe56d625ce8a4
 use think\filesystem\Driver;
 use think\helper\Arr;
 use think\Manager;
-- 
Gitee