mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-08 10:44:23 -04:00
fix merge conflict
This commit is contained in:
parent
91a7b7036e
commit
fad71a6c7d
@ -1,3 +1,3 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.20.0")]
|
[assembly: AssemblyVersion("3.2.20.18")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user