Skip to content

Commit d504901

Browse files
author
Mikolaj Umanski
committed
fix: conflicts
1 parent 4fa9f6e commit d504901

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

src/azure-cli/azure/cli/command_modules/acs/_consts.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@
211211
CONST_ARTIFACT_SOURCE_DIRECT = "Direct"
212212
CONST_ARTIFACT_SOURCE_CACHE = "Cache"
213213

214-
# consts for network isolated cluster
215-
CONST_ARTIFACT_SOURCE_DIRECT = "Direct"
216-
CONST_ARTIFACT_SOURCE_CACHE = "Cache"
217-
218-
219-
220214
# consts for decorator pattern
221215
class DecoratorMode(Enum):
222216
"""Enumerations used to distinguish whether to handle creation or update.

src/azure-cli/azure/cli/command_modules/acs/_validators.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from azure.cli.core.util import CLIError
3030
from knack.log import get_logger
3131

32+
3233
logger = get_logger(__name__)
3334

3435

0 commit comments

Comments
 (0)