diff options
| author | LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com> | 2019-01-23 00:31:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 00:31:35 -0800 |
| commit | 404bd04cbc17dc8c8bf4a5c9aa3ca9c5cd85aa68 (patch) | |
| tree | 3d267c6ceef9439a034c113095e10e4d619e7c70 /MediaBrowser.Model/Serialization/IXmlSerializer.cs | |
| parent | 8ff89fdc0c30f595a171ffc550f907ef22b6212a (diff) | |
| parent | e05e002b8bb4d13eb2b80b56a0aad8903ddb701e (diff) | |
Merge pull request #8 from jellyfin/master
rebase to latest master
Diffstat (limited to 'MediaBrowser.Model/Serialization/IXmlSerializer.cs')
| -rw-r--r-- | MediaBrowser.Model/Serialization/IXmlSerializer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs index b26b673f3..902ebd4d1 100644 --- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs +++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; namespace MediaBrowser.Model.Serialization @@ -34,7 +34,7 @@ namespace MediaBrowser.Model.Serialization /// <param name="file">The file.</param> /// <returns>System.Object.</returns> object DeserializeFromFile(Type type, string file); - + /// <summary> /// Deserializes from bytes. /// </summary> @@ -43,4 +43,4 @@ namespace MediaBrowser.Model.Serialization /// <returns>System.Object.</returns> object DeserializeFromBytes(Type type, byte[] buffer); } -}
\ No newline at end of file +} |
