Skip to content

Commit c68772c

Browse files
committed
Fix rebase fail
1 parent 68c421e commit c68772c

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/libtomahawk/CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,6 @@ set( libGuiSources
9797
playlist/topbar/searchbutton.cpp
9898

9999
ExternalResolverGui.cpp
100-
network/bufferiodevice.cpp
101-
network/msgprocessor.cpp
102-
network/streamconnection.cpp
103-
network/dbsyncconnection.cpp
104-
network/remotecollection.cpp
105-
network/portfwdthread.cpp
106-
network/servent.cpp
107-
network/connection.cpp
108-
network/controlconnection.cpp
109-
110100
resolvers/scriptresolver.cpp
111101
resolvers/qtscriptresolver.cpp
112102

@@ -555,7 +545,7 @@ set( libHeaders
555545

556546
set( libHeaders_NoMOC
557547
infosystem/infoplugins/unix/imageconverter.h
558-
548+
559549
taghandlers/tag.h
560550
taghandlers/apetag.h
561551
taghandlers/asftag.h

0 commit comments

Comments
 (0)