mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
fix merge conflicts
This commit is contained in:
parent
885d1f55a6
commit
5dca8cb077
@ -1,3 +1,3 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.12")]
|
||||
[assembly: AssemblyVersion("3.2.12.11")]
|
||||
|
Loading…
x
Reference in New Issue
Block a user