diff options
| author | Gary Wilber <Spacetech326@gmail.com> | 2020-11-19 18:44:16 -0800 |
|---|---|---|
| committer | Gary Wilber <Spacetech326@gmail.com> | 2020-11-19 18:44:16 -0800 |
| commit | 4a22380565bbf5909ad064461ae9cb59a410a063 (patch) | |
| tree | 6bbc22a8979d6544f2d373413f7f75255945e9a3 /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | d6585e7ff2e14234201e3fe6a75a5af2170c7804 (diff) | |
| parent | 90e4066b12e3b39124f9f4efcb20a0e51499a038 (diff) | |
Merge remote-tracking branch 'upstream/master' into library_scan_speed
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 5f94b5a66..2a6943bb3 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -224,7 +224,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// Loads our children. Validation will occur externally. - /// We want this sychronous. + /// We want this synchronous. /// </summary> protected virtual List<BaseItem> LoadChildren() { |