mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-13 12:41:46 -04:00
resolve merge conflict
This commit is contained in:
parent
85370b847a
commit
5302cd5b20
@ -1,3 +1,3 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.34.0")]
|
||||
[assembly: AssemblyVersion("3.2.34.2")]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user