fix rebase

aws · Mar 29, 2023 · fcaef7c · fcaef7c
1 parent c63eebe
commit fcaef7c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/driver/connection_proxy.h b/driver/connection_proxy.h
@@ -41,7 +41,6 @@ class CONNECTION_PROXY {
     CONNECTION_PROXY(DBC* dbc, DataSource* ds);
     virtual ~CONNECTION_PROXY();
 
-<<<<<<< HEAD
     virtual bool connect(
         const char* host,
         const char* user,
@@ -51,10 +50,6 @@ class CONNECTION_PROXY {
         const char* socket,
         unsigned long flags);
 
-=======
-    virtual bool connect(const char* host, const char* user, const char* password, const char* database,
-                         unsigned int port, const char* socket, unsigned long flags);
->>>>>>> 1bbbca4d (address comments)
     virtual void delete_ds();
     virtual uint64_t num_rows(MYSQL_RES* res);
     virtual unsigned int num_fields(MYSQL_RES* res);