mirror of https://github.com/jellyfin/jellyfin.git
fix merge conflict
This commit is contained in:
parent
70f48f9cea
commit
f54ed74837
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.1.*")]
|
//[assembly: AssemblyVersion("3.1.*")]
|
||||||
[assembly: AssemblyVersion("3.1.0")]
|
[assembly: AssemblyVersion("3.1.260")]
|
||||||
|
|
Loading…
Reference in New Issue