symfony
diff --git a/‎src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
-5Lines changed: 0 additions & 5 deletions b/‎src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
-5Lines changed: 0 additions & 5 deletions
@@ -204,11 +204,6 @@ private function resetPagination()
 
     /**
      * Sets LDAP pagination controls.
-<<<<<<< HEAD
-=======
-     *
-     * @param resource|LDAPConnection $con
->>>>>>> 5.4
      */
     private function controlPagedResult(int $pageSize, bool $critical, string $cookie): bool
     {