mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-06-03 13:44:22 -04:00
fix merge conflict
This commit is contained in:
parent
655cec52c4
commit
f6ed934a7e
@ -1,3 +1,3 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.26.0")]
|
[assembly: AssemblyVersion("3.2.26.26")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user