test
processsummary html
789
456
Merge remote-tracking branch 'origin/master'

Conflicts:
	Merit.Traveller.BMS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Merit.Traveller.v12.suo
Merge remote-tracking branch 'origin/master'

Conflicts:

	Merit.Traveller.BMS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Merit.Traveller.v12.suo
Merge branch 'master' of https://github.com/harryvok/Merit.BMS.Traveller

Conflicts:

	Merit.Traveller.BMS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Merit.Traveller.BMS/obj/Debug/Merit.Traveller.BMS.csproj.FileListAbsolute.txt