fix merge conflict

totaltrader · Nov 22, 2020 · 4a837c5 · 4a837c5
1 parent 17fe5cf
commit 4a837c5
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php
@@ -52,11 +52,6 @@ public function index()
 
     public function anyData()
     {
-<<<<<<< HEAD
-        $tasks = Task::with(['user', 'status', 'client'])->select(
-            ['external_id', 'title', 'created_at', 'deadline', 'user_assigned_id', 'status_id', 'client_id']
-        )->get();
-=======
         $tasks = Task::with(['user', 'status'])->select(
             collect(['external_id', 'title', 'created_at', 'deadline', 'user_assigned_id', 'status_id'])
                 ->map(function ($field) {
@@ -65,7 +60,6 @@ public function anyData()
                 })
                 ->all()
         );
->>>>>>> develop
 
         return Datatables::of($tasks)
             ->addColumn('titlelink', function ($tasks) {