From ab84cf593834dbaf5c509cf3414ac61f51dfcae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BA=D0=BE=D0=B2?= <spirkov.2001@mail.ru>
Date: Tue, 20 Jan 2026 18:39:52 +0400
Subject: [PATCH] Fix merge issues

---
 src/DocBlock/StandardTagFactory.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/DocBlock/StandardTagFactory.php b/src/DocBlock/StandardTagFactory.php
index 1ddba53..1d9e5fe 100644
--- a/src/DocBlock/StandardTagFactory.php
+++ b/src/DocBlock/StandardTagFactory.php
@@ -154,7 +154,6 @@ final class StandardTagFactory implements TagFactory
 
         $tagFactory->addService($descriptionFactory);
         $tagFactory->addService($typeResolver);
-        $tagFactory->registerTagHandler('mixin', $phpstanTagFactory);
         $tagFactory->registerTagHandler('param', $phpstanTagFactory);
         $tagFactory->registerTagHandler('var', $phpstanTagFactory);
         $tagFactory->registerTagHandler('return', $phpstanTagFactory);