mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 20:38:24 +02:00
fix merge conflict
This commit is contained in:
parent
93ae4aab76
commit
5c03b0d769
1 changed files with 2 additions and 2 deletions
|
@ -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…
Reference in a new issue