mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
fix merge conflict
This commit is contained in:
parent
4ab9b1dffb
commit
589300a3b0
@ -1,3 +1,3 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.35.0")]
|
[assembly: AssemblyVersion("3.2.35.2")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user