。

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
                 });
             });
     }