mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-11-15 18:42:21 +00:00
fix merge conflict
This commit is contained in:
1 parent
4ab9b1dffb
commit
589300a3b0
1 file changed
+1
-1
+1
-1
@@ -1,3 +1,3 @@
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.35.0")]
|
||||
[assembly: AssemblyVersion("3.2.35.2")]
|
||||
Reference in new issue
Block a user