Merge branch '3.10-dev' into 4.0-dev

wilsonge · wilsonge · commit cd81ddd83cd5 · 2021-10-24T19:16:43.000+01:00
diff --git a/administrator/components/com_categories/src/Controller/CategoryController.php b/administrator/components/com_categories/src/Controller/CategoryController.php
@@ -125,7 +125,11 @@ protected function allowEdit($data = array(), $key = 'parent_id')
 	 *
 	 * @return  boolean  True if successful, false otherwise.
 	 *
+<<<<<<< HEAD:administrator/components/com_categories/src/Controller/CategoryController.php
 	 * @since   4.0.4
+=======
+	 * @since   3.10.3
+>>>>>>> 3.10-dev:administrator/components/com_categories/controllers/category.php
 	 */
 	public function save($key = null, $urlVar = null)
 	{
@@ -145,7 +149,7 @@ public function save($key = null, $urlVar = null)
 	 *
 	 * @return  boolean  True if access level checks pass, false otherwise.
 	 *
-	 * @since   4.0.4
+	 * @since   3.10.3
 	 */
 	public function cancel($key = null)
 	{

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,11 @@ protected function allowEdit($data = array(), $key = 'parent_id')`
`125`	`125`	`*`
`126`	`126`	`* @return boolean True if successful, false otherwise.`
`127`	`127`	`*`
	`128`	`+<<<<<<< HEAD:administrator/components/com_categories/src/Controller/CategoryController.php`
`128`	`129`	`* @since 4.0.4`
	`130`	`+=======`
	`131`	`+ * @since 3.10.3`
	`132`	`+>>>>>>> 3.10-dev:administrator/components/com_categories/controllers/category.php`
`129`	`133`	`*/`
`130`	`134`	`public function save($key = null, $urlVar = null)`
`131`	`135`	`{`
`@@ -145,7 +149,7 @@ public function save($key = null, $urlVar = null)`
`145`	`149`	`*`
`146`	`150`	`* @return boolean True if access level checks pass, false otherwise.`
`147`	`151`	`*`
`148`		`- * @since 4.0.4`
	`152`	`+ * @since 3.10.3`
`149`	`153`	`*/`
`150`	`154`	`public function cancel($key = null)`
`151`	`155`	`{`