Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/core/StarJson.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/core/StarJson.cpp')
-rw-r--r--source/core/StarJson.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/core/StarJson.cpp b/source/core/StarJson.cpp
index 3f65e33..54d3fe7 100644
--- a/source/core/StarJson.cpp
+++ b/source/core/StarJson.cpp
@@ -1025,7 +1025,7 @@ Json jsonMerge(Json const& base, Json const& merger) {
if (!res.second)
res.first->second = jsonMerge(res.first->second, p.second);
}
- return move(merged);
+ return merged;
} else if (merger.type() == Json::Type::Null) {
return base;