aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-08-06 00:38:48 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-08-06 00:38:48 -0400
commitd290a548456473ab40e5a6c8640c1c6e73df2e22 (patch)
tree238e0e9374d65129daabd439e6c2bacca899b45c /MediaBrowser.LocalMetadata
parent319a956b3870e162b3072b52ea8c7310d5091bc6 (diff)
parentfec7c4782432edd38fdbdcca9234a93b5562181a (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Diffstat (limited to 'MediaBrowser.LocalMetadata')
-rw-r--r--MediaBrowser.LocalMetadata/BaseXmlProvider.cs2
-rw-r--r--MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index 0289ffb08..f23559e4b 100644
--- a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
@@ -75,7 +75,7 @@ namespace MediaBrowser.LocalMetadata
}
}
- public int Order
+ public virtual int Order
{
get
{
diff --git a/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs
index 8f9d21eae..0893f192f 100644
--- a/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/SeriesXmlProvider.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.LocalMetadata.Providers
return directoryService.GetFile(Path.Combine(info.Path, "series.xml"));
}
- public int Order
+ public override int Order
{
get
{