From 8284291131b5e7e87e9b9ef197a6ff455b523a39 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Mon, 14 Sep 2020 10:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/HomeController.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php
index b93cf38..1f3a831 100644
--- a/app/Admin/Controllers/HomeController.php
+++ b/app/Admin/Controllers/HomeController.php
@@ -118,11 +118,7 @@ class HomeController extends Controller
                 });
 
                 $row->column(4, function (Column $column) {
-<<<<<<< .mine
                     $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS));
-=======
-                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id, 3));
->>>>>>> .theirs
                 });
             });
     }