From b796300aa614e93d525c7ecd615a3109ba919601 Mon Sep 17 00:00:00 2001 From: addshore Date: Fri, 4 Dec 2015 21:45:30 +0100 Subject: [PATCH] Fix phpdoc of StatusValue::merge Change-Id: I6fec36f9911d647fa7507c36b57f6b11ef04d63d --- includes/libs/StatusValue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php index 3c2dd4093d..35de084b5f 100644 --- a/includes/libs/StatusValue.php +++ b/includes/libs/StatusValue.php @@ -181,7 +181,7 @@ class StatusValue { /** * Merge another status object into this one * - * @param Status $other Other Status object + * @param StatusValue $other Other StatusValue object * @param bool $overwriteValue Whether to override the "value" member */ public function merge( $other, $overwriteValue = false ) { -- 2.20.1