fix: fix the conflict

ping-yee · ping-yee · commit 5d7b8864341b · 2023-07-03T13:35:24.000+08:00
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
@@ -15,8 +15,8 @@
     /**
      * Formats a numbers as bytes, based on size, and adds the appropriate suffix
      *
-     * @param array|int|string $num    Will be cast as int
-     * @param string           $locale
+     * @param int|string $num    Will be cast as int
+     * @param string     $locale
      *
      * @return bool|string
      */

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`/**`
`16`	`16`	`* Formats a numbers as bytes, based on size, and adds the appropriate suffix`
`17`	`17`	`*`
`18`		`- * @param array\|int\|string $num Will be cast as int`
`19`		`- * @param string $locale`
	`18`	`+ * @param int\|string $num Will be cast as int`
	`19`	`+ * @param string $locale`
`20`	`20`	`*`
`21`	`21`	`* @return bool\|string`
`22`	`22`	`*/`