From 38a7bd6f3b1a96f92cbdcc303ad6b404d15aef76 Mon Sep 17 00:00:00 2001
From: Akolzin Dmitry <akolzinvs@gmail.com>
Date: Fri, 5 Feb 2021 13:28:28 +0300
Subject: [PATCH] fix FrontApiClientAuthenticator, add phpdoc

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 56a9d5d..7690d76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,10 +40,7 @@ composer.lock
 /app/phpunit.xml
 /phpunit.xml
 .phpunit.result.cache
-<<<<<<< HEAD
 test-report.xml
-=======
->>>>>>> add callback argument value resolver
 
 # Build data
 /build/