Cleanup for application refresh with resources

Author: cderici

juju/application.py

@@ -686,9 +686,6 @@ async def refresh(
                                      force_units, path or switch, resources)
             return
 
-        if resources is not None:
-            raise NotImplementedError("resources option is not implemented")
-
         # If switch is not None at this point, that means it's a switch to a store charm
         charm_url = switch or charm_url_origin_result.url
         parsed_url = URL.parse(charm_url)

juju/utils.py

@@ -421,7 +421,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. ubuntu@22.04)