mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-02-10 15:05:04 +01:00
fix merge conflict
This commit is contained in:
parent
677709f420
commit
b3db8fdb0d
1 changed files with 1 additions and 1 deletions
|
|
@ -1,4 +1,4 @@
|
|||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.1.*")]
|
||||
[assembly: AssemblyVersion("3.0.6000")]
|
||||
[assembly: AssemblyVersion("3.1.80")]
|
||||
|
|
|
|||
Loading…
Reference in a new issue