Cleanup conflict noise

Author: cderici

juju/application.py

@@ -733,8 +733,6 @@ async def refresh(
             err = charm_origin_result.error
             raise JujuError(f'{err.code} : {err.message}')
 
-<<<<<<< HEAD
-=======
         # Now take care of the resources:
 
         # user supplied resources to be used in refresh,
@@ -751,7 +749,6 @@ async def refresh(
             else:
                 _arg_res_filenames[res] = filename_or_rev
 
->>>>>>> 5fbf5bc (Avoid trying to pass revision unless provided by user in app refresh)
         # Already prepped the charm_resources
         # Now get the existing resources from the ResourcesFacade
         request_data = [client.Entity(self.tag)]