mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
fix merge conflict
This commit is contained in:
parent
ee06dfbc50
commit
dbeea014aa
1 changed files with 2 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.0.*")]
|
//[assembly: AssemblyVersion("3.0.*")]
|
||||||
//[assembly: AssemblyVersion("3.0.5800.1")]
|
[assembly: AssemblyVersion("3.0.5800.2")]
|
||||||
|
|
Loading…
Reference in a new issue