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

Merge: Detached Head

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