Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 21:20:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of merge errors.

Browse source
This commit is contained in:
Greenback 2020-11-21 14:09:56 +00:00
parent 33f6b13d4f
commit 086e2fdaa1
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
MediaBrowser.Model/Configuration/PathSubstitution.cs
View file

@ -1,11 +1,4 @@
#nullable enable #nullable enable
#pragma warning disable CS1591
#pragma warning disable CA1819
using System;
using System.Collections.Generic;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Updates;
namespace MediaBrowser.Model.Configuration namespace MediaBrowser.Model.Configuration
{ {