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