mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
fix merge conflict
This commit is contained in:
parent
bc58e2862c
commit
4853e795d7
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.1.*")]
|
//[assembly: AssemblyVersion("3.1.*")]
|
||||||
[assembly: AssemblyVersion("3.0.8500")]
|
[assembly: AssemblyVersion("3.1.259")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user