Merge branch 'develop' into pr/1113

This commit is contained in:
Alex Fabijanic
2016-03-10 08:57:21 -08:00
5 changed files with 10 additions and 10 deletions

View File

@@ -67,10 +67,8 @@ private:
AsyncReader(const AsyncReader&);
AsyncReader& operator = (const AsyncReader&);
Activity<AsyncReader> _activity;
Client& _client;
Activity<AsyncReader> _activity;
};