Merge pull request #14326 from civicrm/5.14

[civicrm-core.git] / Civi / Core / SettingsBag.php

diff --git a/Civi/Core/SettingsBag.php b/Civi/Core/SettingsBag.php
index 86d48bbb791e713400f320fc7fb0791a055127dd..d2f742ad405323748c1440d9042499210d56244b 100644 (file)
--- a/Civi/Core/SettingsBag.php
+++ b/Civi/Core/SettingsBag.php
@@ -70,7 +70,7 @@ class SettingsBag {
    * The result of combining default values, mandatory
    * values, and user values.
    *
-   * @var array|NULL
+   * @var array|null
    *   Array(string $settingName => mixed $value).
    */
   protected $combined;