mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-05-24 02:02:29 -04:00
fix merge conflict
This commit is contained in:
parent
9012759769
commit
821d673111
@ -1,4 +1,4 @@
|
||||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.1.*")]
|
||||
[assembly: AssemblyVersion("3.0.5990")]
|
||||
[assembly: AssemblyVersion("3.1.73")]
|
||||
|
Loading…
x
Reference in New Issue
Block a user