mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 09:59:06 -07:00
fix merge conflict
This commit is contained in:
parent
40530f7293
commit
100236f416
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.1.*")]
|
//[assembly: AssemblyVersion("3.1.*")]
|
||||||
[assembly: AssemblyVersion("3.0.6010")]
|
[assembly: AssemblyVersion("3.1.81")]
|
||||||
|
Loading…
Reference in New Issue
Block a user