fix merge conflict · 025905a3e4 - jellyfin - Cloudchain Git

Your ROOT_URL in app.ini is https://git.cloudchain.link/ but you are visiting https://dash.bss.nz/open-source-mirrors/jellyfin/commit/025905a3e4d50b9a2e07fbf4ff0a203af6604ced You should set ROOT_URL correctly, otherwise the web may not work correctly.

fix merge conflict

release-10.1.0

Luke Pulverenti

parent 54d5b71577

commit 025905a3e4

1 changed files with 1 additions and 1 deletions

										
											2

SharedVersion.cs

										Unescape
										Escape
									
											View File
										
					@ -1,4 +1,4 @@

					﻿using System.Reflection;

					//[assembly: AssemblyVersion("3.1.*")]

					[assembly: AssemblyVersion("3.0.8500")]

					[assembly: AssemblyVersion("3.1.259")]