mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-31 14:33:54 -04:00
fix merge conflicts
This commit is contained in:
parent
ee8c829c5b
commit
4f8684a16b
@ -1,3 +1,3 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.28.0")]
|
||||
[assembly: AssemblyVersion("3.2.28.8")]
|
||||
|
Loading…
x
Reference in New Issue
Block a user