mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-05-24 02:02:29 -04:00
fix merge conflict
This commit is contained in:
parent
423045dd56
commit
3e29d73d0c
@ -1,3 +1,3 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.13")]
|
||||
[assembly: AssemblyVersion("3.2.13.14")]
|
||||
|
Loading…
x
Reference in New Issue
Block a user