Skip to content
Prev Previous commit
Next Next commit
Fixed problems from merge conflict.
  • Loading branch information
Haroon Feisal committed Mar 8, 2022
commit 8e38f0aad398984f62c426d77758757c6832ed84
2 changes: 1 addition & 1 deletion src/containerapp/azext_containerapp/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
Dapr as DaprModel,
ContainerResources as ContainerResourcesModel,
Scale as ScaleModel,
Container as ContainerModel, GitHubActionConfiguration, RegistryInfo, AzureCredentials)
Container as ContainerModel, GitHubActionConfiguration, RegistryInfo, AzureCredentials, SourceControl)
from ._utils import (_validate_subscription_registered, _get_location_from_resource_group, _ensure_location_allowed,
parse_secret_flags, store_as_secret_and_return_secret_ref, parse_list_of_strings, parse_env_var_flags,
_generate_log_analytics_if_not_provided, _get_existing_secrets, _convert_object_from_snake_to_camel_case,
Expand Down