合并多地更改

app/common/facade/FileUtils.php

@@ -21,27 +21,3 @@ class FileUtils extends Facade
         return 'app\common\utils\FileUtils';
     }
 }
-=======
-<?php
-declare(strict_types=1);
-
-namespace app\common\facade;
-
-use think\Facade;
-
-/**
- * @see \app\common\utils\FileUtils
- * @package app\common\facade
- * @mixin \app\common\utils\FileUtils
- * @method static \think\Image waterMark()
- * @method static \think\Image thumbnail()
- * @method static \think\file\UploadedFile downloadUrlImg()
- */
-class FileUtils extends Facade
-{
-    protected static function getFacadeClass()
-    {
-        return 'app\common\utils\FileUtils';
-    }
-}
->>>>>>> 78b76253c8ce5873016cf837373af5e30ac80c86