mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
resolve merge conflict
This commit is contained in:
parent
85370b847a
commit
5302cd5b20
1 changed files with 1 additions and 1 deletions
|
@ -1,3 +1,3 @@
|
|||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.34.0")]
|
||||
[assembly: AssemblyVersion("3.2.34.2")]
|
||||
|
|
Loading…
Reference in a new issue