@@ -22,7 +22,11 @@
<AutoIncrementBuild Value="True"/>
<MinorVersionNr Value="2"/>
<RevisionNr Value="1"/>
+<<<<<<< Updated upstream
<BuildNr Value="87"/>
+=======
+ <BuildNr Value="85"/>
+>>>>>>> Stashed changes
<Language Value="0407"/>
<StringTable CompanyName="MCS" FileDescription="TPS/SPS Emulator" InternalName="SPS_EMU" LegalCopyright="MCS (C) Wilfried Klaas" OriginalFilename="SPS_EMU.exe" ProductName="TPS/SPS Emulator" ProductVersion="0.2"/>
</VersionInfo>
