diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-14 13:03:00 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-14 13:03:00 -0400 |
| commit | 075952107b01031fef13d94c46246c53306fcda8 (patch) | |
| tree | 3fdbc125a6325c9c3cbf60636edbfa264f6eca57 /MediaBrowser.Model/ApiClient/IDevice.cs | |
| parent | cf0456360b3dda956f72fe872be4d51255d76f0f (diff) | |
| parent | 7a296ccbc127ecbc47e55c0396353dde72f8ae83 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Model/ApiClient/IDevice.cs')
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IDevice.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Model/ApiClient/IDevice.cs b/MediaBrowser.Model/ApiClient/IDevice.cs index 84927c20a..7b67122fb 100644 --- a/MediaBrowser.Model/ApiClient/IDevice.cs +++ b/MediaBrowser.Model/ApiClient/IDevice.cs @@ -39,6 +39,6 @@ namespace MediaBrowser.Model.ApiClient /// <param name="apiClient">The API client.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - Task UploadFile(LocalFileInfo file, IApiClient apiClient, CancellationToken cancellationToken); + Task UploadFile(LocalFileInfo file, IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken)); } } |
