调整冲突

app/Admin/Controllers/Activity/CouponController.php

@@ -24,11 +24,6 @@ class CouponController extends AdminController
             $filter->column(1 / 2, function ($filter) {
                 $filter->equal('status', '状态')->select(ActivityCoupon::STATUS);
                 $filter->between('used_at', '核销时间')->datetime();
-<<<<<<< HEAD
-=======
-
-
->>>>>>> a7719d7038809738262e66c70e301947845f680d
                 $filter->where(function ($query) {
                     $query->whereHas('outlet', function ($query) {
                         $query->whereHas('info', function ($query) {
@@ -57,11 +52,6 @@ class CouponController extends AdminController
                     })
                     ->get()
                     ->pluck('nickname', 'id');
-<<<<<<< HEAD
-
-=======
-                
->>>>>>> a7719d7038809738262e66c70e301947845f680d
                 $filter->where(function ($query) {
                     $query->whereHas('outlet', function ($query) {
                         $query->whereHas('parent', function ($query) {