diff options
Diffstat (limited to 'source/game/StarNpcDatabase.cpp')
| -rw-r--r-- | source/game/StarNpcDatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/game/StarNpcDatabase.cpp b/source/game/StarNpcDatabase.cpp index 2af5511..dd0a5fc 100644 --- a/source/game/StarNpcDatabase.cpp +++ b/source/game/StarNpcDatabase.cpp @@ -383,7 +383,7 @@ Json NpcDatabase::mergeConfigValues(Json const& base, Json const& merger) const map[entry.first] = mergeConfigValues(map[entry.first], entry.second); } } - return std::move(map); + return map; } else if (merger.isNull()) { return base; } else { |