Backup_Repos/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-20 03:43:45 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-29 21:55:57 -05:00
parent ee06dfbc50
commit dbeea014aa
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SharedVersion.cs
View file

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5800.1")]
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5800.2")]