mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 22:07:13 -04:00
fix merge conflict
This commit is contained in:
parent
c48a4cfb99
commit
f14e9b8d3a
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.0.*")]
|
//[assembly: AssemblyVersion("3.0.*")]
|
||||||
[assembly: AssemblyVersion("3.0.5818")]
|
[assembly: AssemblyVersion("3.0.5857")]
|
||||||
|
Loading…
Reference in New Issue
Block a user