mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-16 18:42:52 -07:00
fix merge conflict
This commit is contained in:
parent
297cbb2610
commit
724aa4af40
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.0.*")]
|
//[assembly: AssemblyVersion("3.0.*")]
|
||||||
[assembly: AssemblyVersion("3.0.5947")]
|
[assembly: AssemblyVersion("3.0.5934")]
|
||||||
|
Loading…
Reference in New Issue
Block a user