Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 12:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-28 15:45:17 -04:00
parent 3785298dd9
commit 21a8dc77c3
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; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] [assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.126")] //[assembly: AssemblyVersion("3.0.6060")]