dummy push - try todo with new src string

SchmidtDSE · Jan 22, 2024 · c9f2ba2 · c9f2ba2
2 parents e3fc2ad + c003877
commit c9f2ba2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/util/sftp.py b/src/util/sftp.py
@@ -12,7 +12,11 @@
 from google.cloud import logging as cloud_logging
 
 
+<<<<<<< HEAD
 # TODO: Convert to agnostic Boto client
+=======
+# TODO [$65aeaf6b5159da0008241be0]: Convert to agnostic Boto client 
+>>>>>>> c003877bbc264e4d7587c47004afda935bc32987
 # Use the slick smart-open library to handle S3 connections. This maintains the agnostic nature
 # of sftp, not tied to any specific cloud provider, but is way more efficient than paramiko/sftp in terms of $$
 class SFTPClient: