mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-08-11 09:13:54 -04:00
fix merge conflict
This commit is contained in:
parent
43377ec1e2
commit
93817bdb7b
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.0.*")]
|
//[assembly: AssemblyVersion("3.0.*")]
|
||||||
//[assembly: AssemblyVersion("3.0.5781.3")]
|
[assembly: AssemblyVersion("3.0.5781.4")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user