Cleanup for application refresh with resources

juju · Oct 24, 2023 · b7a13f2 · b7a13f2
1 parent 465ac45
commit b7a13f2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/juju/application.py b/juju/application.py
@@ -684,9 +684,6 @@ async def refresh(
                                      force_units, path, resources)
             return
 
-        if resources is not None:
-            raise NotImplementedError("resources option is not implemented")
-
         parsed_url = URL.parse(charm_url)
         charm_name = parsed_url.name
 

diff --git a/juju/utils.py b/juju/utils.py
@@ -422,7 +422,6 @@ def base_channel_to_series(channel):
     return get_version_series(origin.Channel.parse(channel).track)
 
 
-<<<<<<< HEAD
 def parse_base_arg(base):
     """Parses a given base into a Client.Base object
     :param base str : The base to deploy a charm (e.g. [email protected])