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
ea83790305
commit
1285512160
@ -1,4 +1,4 @@
|
||||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.5870")]
|
||||
[assembly: AssemblyVersion("3.0.5879")]
|
||||
|
Loading…
x
Reference in New Issue
Block a user