From 02b8219b41450a69590505c4cc0ee008cf279d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?=
 <kerim.kilic@hbksoftware.com.tr>
Date: Wed, 3 Feb 2021 15:33:53 +0300
Subject: [PATCH] fixed conflict

---
 .../advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php
index ed34bcf4b..9a00879b9 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php
@@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ReadySimpleAdvFormColumns
 {
-
     protected $fields;
     public function __construct($fields)
     {