Fix wrong conflict solution
commit00bb97c7a62fd824d47c25c281190f6c18bdc195
authorMichal Hruby <michal.mhr@gmail.com>
dateWed 2 Oct 2013, 15:04 (13 years ago)
parentc0728c4
tests/mocks/Unity/fake_scope.h−1
@@ -32,7 +32,6 @@ class Scope : public QObject
3232 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
3333 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
3434 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
35− Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)
3635 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
3736 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
3837 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)