Solved conflicts. Remove code related to 'slave commit size'

greenbone · Mar 22, 2021 · 238483c · 238483c
1 parent 5c8c485
commit 238483c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/src/gvmd.c b/src/gvmd.c
@@ -2086,15 +2086,9 @@ gvmd (int argc, char** argv)
 
   set_schedule_timeout (schedule_timeout);
 
-<<<<<<< HEAD
-=======
   /* Set the connection auto retry */
   set_scanner_connection_retry (scanner_connection_retry);
 
-  /* Set slave commit size */
-  set_slave_commit_size (slave_commit_size);
-
->>>>>>> 9c5893eb1... Set scanner_connection_retry at start
   /* Set SecInfo update commit size */
 
   set_secinfo_commit_size (secinfo_commit_size);

diff --git a/src/manage.h b/src/manage.h
@@ -2466,19 +2466,11 @@ manage_system_report (const char *, const char *, const char *, const char *,
 
 /* Scanners. */
 
-<<<<<<< HEAD
-=======
-/**
- * @brief Default for slave update commit size.
- */
-#define SLAVE_COMMIT_SIZE_DEFAULT 0
-
 /**
  * @brief Default for max auto retry on connection to scanner lost.
  */
 #define SCANNER_CONNECTION_RETRY_DEFAULT 3
 
->>>>>>> 3428320cf... Add gvmd option 'scanner-connection-retry'
 int
 manage_create_scanner (GSList *, const db_conn_info_t *, const char *,
                        const char *, const char *, const char *, const char *,