mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 05:37:17 +02:00
Fix merge error
This commit is contained in:
parent
083205916f
commit
d0e1ec3a86
1 changed files with 0 additions and 3 deletions
|
@ -29,9 +29,6 @@ public:
|
||||||
bool isReady() const { return _isReady; }
|
bool isReady() const { return _isReady; }
|
||||||
|
|
||||||
const QByteArray& getByteArray() { return _byteArray; }
|
const QByteArray& getByteArray() { return _byteArray; }
|
||||||
|
|
||||||
signals:
|
|
||||||
void ready();
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void ready();
|
void ready();
|
||||||
|
|
Loading…
Reference in a new issue