Fix merge conflicts

laoneo · laoneo · commit 6c05d600e966 · 2023-05-31T17:28:46.000+02:00
diff --git a/administrator/components/com_users/src/Model/CaptiveModel.php b/administrator/components/com_users/src/Model/CaptiveModel.php
@@ -418,7 +418,7 @@ private function getAllowedModulePositions(): array
      *
      * @return  boolean true if user can use the method, false if not
      *
-     * @since    4.4.0
+     * @since    4.3.2
      * @throws  \Exception
      */
     public function checkTryLimit(MfaTable $method)
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'alpha2-dev';
+    public const EXTRA_VERSION = 'dev';
 
     /**
      * Development status.

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ private function getAllowedModulePositions(): array`
`418`	`418`	`*`
`419`	`419`	`* @return boolean true if user can use the method, false if not`
`420`	`420`	`*`
`421`		`- * @since 4.4.0`
	`421`	`+ * @since 4.3.2`
`422`	`422`	`* @throws \Exception`
`423`	`423`	`*/`
`424`	`424`	`public function checkTryLimit(MfaTable $method)`