mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-02-14 07:14:11 -05:00
fix merge conflict
This commit is contained in:
parent
4be3ee433b
commit
0c3b7a33c2
@ -1,4 +1,4 @@
|
||||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.1.*")]
|
||||
[assembly: AssemblyVersion("3.0.6020")]
|
||||
[assembly: AssemblyVersion("3.1.89")]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user