mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 09:59:06 -07:00
fix merge conflict
This commit is contained in:
parent
b40250045a
commit
84d2a5303b
@ -1,4 +1,4 @@
|
||||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.1.*")]
|
||||
[assembly: AssemblyVersion("3.1.5")]
|
||||
[assembly: AssemblyVersion("3.1.295")]
|
||||
|
Loading…
Reference in New Issue
Block a user