Fix merge conflict

test/CMakeLists.txt

@@ -11,6 +11,7 @@ list(APPEND TestFiles
             audio/TestAudioWriter.cpp
             audio/TestMidiReader.cpp
             core/TestBinaryStream.cpp
+            compiler/TestLexer.cpp
             compression/TestStreamCompressor.cpp
             database/TestDatabase.cpp
             fonts/TestFontReader.cpp
@@ -25,8 +26,8 @@ list(APPEND TestFiles
             video/TestVideoDecoder.cpp
             windows/TestWaylandWindow.cpp
             web/TestMarkdownParser.cpp
-            web/TestXmlParser.cpp
 			web/TestSvgWriter.cpp)         
+            web/TestXmlParser.cpp)
 
 find_package(PkgConfig)            
 pkg_check_modules(DBUS dbus-1)
@@ -38,6 +39,7 @@ foreach(TestFile ${TestFiles})
 	cmake_path(GET TestFileName STEM TestName)
 
     add_executable(${TestName}  ${TestFile})
+
     target_link_libraries(${TestName} PUBLIC core compression fonts network image publishing video database geometry audio graphics web client test_utils ${DBUS_LIBRARIES})
 	set_property(TARGET ${TestName} PROPERTY FOLDER test)
 endforeach()

test/compiler/TestLexer.cpp

@@ -0,0 +1,5 @@
+
+int main(int argc, char** argv)
+{
+	return 0;
+}