Resolve "Pipeline State Object"

Closes #11 (closed)

config/Sources.cmake

@@ -12,11 +12,7 @@ set(vkcv_sources
 
 		${vkcv_include}/vkcv/Window.hpp
 		${vkcv_source}/vkcv/Window.cpp
-<<<<<<< HEAD
-		${vkcv_source}/vkcv/CoreManager.hpp
-		${vkcv_source}/vkcv/CoreManager.cpp
+
 		${vkcv_source}/vkcv/ShaderProgram.hpp
 		${vkcv_source}/vkcv/ShaderProgram.cpp
-=======
->>>>>>> 74ff8e7041d7958006a434cf4d3a7fee0a3fa724
 )