jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: Repository Monitor

Browse Source
This commit is contained in:
Gary Sharp
2013-04-30 13:33:06 +10:00
parent 52d57a35c2
commit f6849535b0
14 changed files with 638 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Client/Properties/AssemblyInfo.cs
+5
View File
@@ -32,5 +32,10 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
<<<<<<< HEAD
[assembly: AssemblyVersion("1.2.0429.1616")]
[assembly: AssemblyFileVersion("1.2.0429.1616")]
=======
[assembly: AssemblyVersion("1.2.0411.1608")]
[assembly: AssemblyFileVersion("1.2.0411.1608")]
>>>>>>> origin/Repository-Monitor