From db6bd05163ee0a050f6f27e2139fe5e404f50aea Mon Sep 17 00:00:00 2001
From: freek <freek@spatie.be>
Date: Mon, 13 Jul 2020 23:03:23 +0200
Subject: [PATCH] wip

---
 .php_cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.php_cs b/.php_cs
index 1c4e7d56..4ca9a7f8 100644
--- a/.php_cs
+++ b/.php_cs
@@ -10,6 +10,7 @@ $finder = Symfony\Component\Finder\Finder::create()
     ])
     ->name('*.php')
     ->notName('*.blade.php')
+    ->notName('GitConflictController.php')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);