Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed incorrect auto-merge
  • Loading branch information
lmazuel committed Jul 25, 2019
commit d2659520567c9b47a47ede5f2555fe887cdcc971
4 changes: 0 additions & 4 deletions sdk/storage/azure-storage-file/azure/storage/file/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# pylint: disable=super-init-not-called, too-many-lines

from azure.core.paging import PageIterator
from ._shared.utils import (
return_context_and_deserialized,
process_storage_error)

from ._shared.response_handlers import return_context_and_deserialized, process_storage_error
from ._shared.models import DictMixin, get_enum_value
from ._generated.models import StorageErrorException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@

from typing import List # pylint: disable=unused-import
from azure.core.paging import PageIterator
from ._shared.utils import (
return_context_and_deserialized,
process_storage_error)
from ._shared.response_handlers import return_context_and_deserialized, process_storage_error
from ._shared.models import DictMixin
from ._generated.models import StorageErrorException
from ._generated.models import AccessPolicy as GenAccessPolicy
Expand Down