mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-01-15 23:58:57 +00:00
fix merge conflicts
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.30.0")]
|
||||
[assembly: AssemblyVersion("3.2.30.27")]
|
||||
|
||||
Reference in New Issue
Block a user