diff options
| author | Phallacy <Dragoonmac@gmail.com> | 2019-02-20 00:46:13 -0800 |
|---|---|---|
| committer | Phallacy <Dragoonmac@gmail.com> | 2019-02-20 00:46:13 -0800 |
| commit | a0d31a49a0047a39cb2c4f7d67be64153b0a3266 (patch) | |
| tree | 8c0b3a7fb0b68bf778b92872a32949a88b891d80 /MediaBrowser.Model/System/PublicSystemInfo.cs | |
| parent | 6bbb968b578fe42224227b70e78825bbed5cfc6f (diff) | |
| parent | 6c6e9ca9f22d4c4bd1175d4abae846d09d2f074d (diff) | |
merging with master to clear merge conflict
Diffstat (limited to 'MediaBrowser.Model/System/PublicSystemInfo.cs')
| -rw-r--r-- | MediaBrowser.Model/System/PublicSystemInfo.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs index accdc9e60..d97eda352 100644 --- a/MediaBrowser.Model/System/PublicSystemInfo.cs +++ b/MediaBrowser.Model/System/PublicSystemInfo.cs @@ -24,12 +24,12 @@ namespace MediaBrowser.Model.System /// Gets or sets the server version. /// </summary> /// <value>The version.</value> - public string Version { get; set; } + public string Version { get; set; } /// <summary> - /// Gets or sets the operating sytem. + /// Gets or sets the operating system. /// </summary> - /// <value>The operating sytem.</value> + /// <value>The operating system.</value> public string OperatingSystem { get; set; } /// <summary> |