Merge master fixed conflict.

This commit is contained in:
DW
2017-01-05 21:36:55 +02:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.25.0")]
[assembly: AssemblyFileVersion("1.0.25.0")]
[assembly: AssemblyFileVersion("1.0.25.0")]