mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-17 02:49:05 -07:00
fix merge conflict
This commit is contained in:
parent
76bfde2675
commit
e951dd20d9
@ -1,4 +1,4 @@
|
||||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.5786.0")]
|
||||
[assembly: AssemblyVersion("3.0.5814")]
|
||||
|
Loading…
Reference in New Issue
Block a user