fix merge conflict · 88153d3875 - 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/88153d3875532c2fe648d92b36c7b4aa353b56e4 You should set ROOT_URL correctly, otherwise the web may not work correctly.

fix merge conflict

pull/702/head

Luke Pulverenti

parent 03118de6b7

commit 88153d3875

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.0.*")]

					[assembly: AssemblyVersion("3.0.5782.0")]

					[assembly: AssemblyVersion("3.0.5800.0")]