Small fix on merge conflict

Author: Fletterio

src/nbl/asset/utils/ISPIRVOptimizer.cpp

@@ -43,7 +43,6 @@ nbl::core::smart_refctd_ptr<ICPUBuffer> ISPIRVOptimizer::optimize(const uint32_t
         &spvtools::CreateIfConversionPass,
         &spvtools::CreateStripDebugInfoPass,
         //&spvtools::CreateAggressiveDCEPass
->>>>>>> master
     };
 
     auto msgConsumer = [&logger](spv_message_level_t level, const char* src, const spv_position_t& pos, const char* msg)