summaryrefslogtreecommitdiffstats
path: root/api/logic/meta/Index.h
diff options
context:
space:
mode:
Diffstat (limited to 'api/logic/meta/Index.h')
-rw-r--r--api/logic/meta/Index.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/meta/Index.h b/api/logic/meta/Index.h
index 9811e152..0ec43f96 100644
--- a/api/logic/meta/Index.h
+++ b/api/logic/meta/Index.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2017 MultiMC Contributors
+/* Copyright 2015-2018 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public:
QVector<VersionListPtr> lists() const { return m_lists; }
public: // for usage by parsers only
- void merge(const BaseEntity::Ptr &other) override;
+ void merge(const std::shared_ptr<Index> &other);
void parse(const QJsonObject &obj) override;
private: