# Conflicts: # lib/EapHost/src/Credentials.cpp # lib/EapHost/src/StdAfx.h # lib/Events/res/EventsETW.man