fix merge

netobserv · Jan 2, 2024 · 04269b8 · 04269b8
1 parent 1a76dc3
commit 04269b8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/v1beta1/flowcollector_webhook.go b/api/v1beta1/flowcollector_webhook.go
@@ -284,7 +284,7 @@ func Convert_v1beta1_FlowCollectorFLP_To_v1beta2_FlowCollectorFLP(in *FlowCollec
 		ConversationEndTimeout:         helper.GetDebugDurationValue(debugPath, "conversationEndTimeout", in.ConversationEndTimeout),
 		ConversationTerminatingTimeout: helper.GetDebugDurationValue(debugPath, "conversationTerminatingTimeout", in.ConversationTerminatingTimeout),
 	}
-	return autoConvert_v1beta1_FlowCollectorFLP_To_v1beta2_FlowCollectorFLP(in, out, s)
+	return nil
 }
 
 // we have new defined fields in v1beta2 not in v1beta1