mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 18:08:53 -07:00
fix merge conflict
This commit is contained in:
parent
49fd5551ba
commit
0ac0a09c80
@ -1,3 +1,3 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.5")]
|
[assembly: AssemblyVersion("3.2.6.1")]
|
||||||
|
Loading…
Reference in New Issue
Block a user