mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-02-07 03:13:34 -05:00
fix merge conflict
This commit is contained in:
parent
93ae4aab76
commit
5c03b0d769
@ -1,4 +1,4 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.0.*")]
|
||||
//[assembly: AssemblyVersion("3.0.5781.5")]
|
||||
//[assembly: AssemblyVersion("3.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.5781.6")]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user