Fix double header and cpp definition due to rebase error
This commit is contained in:
parent
91d3ecbbf5
commit
033d62a98d
@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
TARGET = nymea-core
|
TARGET = nymea-core
|
||||||
|
|
||||||
@ -37,7 +38,6 @@ RESOURCES += $$top_srcdir/icons.qrc \
|
|||||||
|
|
||||||
HEADERS += nymeacore.h \
|
HEADERS += nymeacore.h \
|
||||||
integrations/apikeysprovidersloader.h \
|
integrations/apikeysprovidersloader.h \
|
||||||
hardware/zigbee/zigbeehardwareresourceimplementation.h \
|
|
||||||
integrations/plugininfocache.h \
|
integrations/plugininfocache.h \
|
||||||
integrations/python/pynymealogginghandler.h \
|
integrations/python/pynymealogginghandler.h \
|
||||||
integrations/python/pynymeamodule.h \
|
integrations/python/pynymeamodule.h \
|
||||||
@ -138,7 +138,6 @@ HEADERS += nymeacore.h \
|
|||||||
|
|
||||||
SOURCES += nymeacore.cpp \
|
SOURCES += nymeacore.cpp \
|
||||||
integrations/apikeysprovidersloader.cpp \
|
integrations/apikeysprovidersloader.cpp \
|
||||||
hardware/zigbee/zigbeehardwareresourceimplementation.cpp \
|
|
||||||
integrations/plugininfocache.cpp \
|
integrations/plugininfocache.cpp \
|
||||||
integrations/thingmanagerimplementation.cpp \
|
integrations/thingmanagerimplementation.cpp \
|
||||||
integrations/translator.cpp \
|
integrations/translator.cpp \
|
||||||
|
|||||||
Reference in New Issue
Block a user