fix unwnated marge

cybozu-go · May 20, 2024 · e74926c · e74926c
1 parent 8893d25
commit e74926c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/controllers/mysql_container.go b/controllers/mysql_container.go
@@ -133,10 +133,13 @@ func (r *MySQLClusterReconciler) makeV1AgentContainer(cluster *mocov1beta2.MySQL
 	}
 	if cluster.Spec.LogRotationSchedule != "" {
 		c.WithArgs("--log-rotation-schedule", cluster.Spec.LogRotationSchedule)
+<<<<<<< HEAD
 	}
 
 	if cluster.Spec.AgentUseLocalhost {
 		c.WithArgs(constants.MocoMySQLDLocalhostFlag, strconv.FormatBool(cluster.Spec.AgentUseLocalhost))
+=======
+>>>>>>> parent of 403eb1a... Fix init container arguments
 	}
 
 	c.WithVolumeMounts(