Fixed a couple of merge errors.

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

View File

@ -1,11 +1,4 @@
#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
{