From 3dc506cc5246bbd3832af5008b9d1d782c97787f Mon Sep 17 00:00:00 2001
From: scwlkq <scwlkq@gmail.com>
Date: Sat, 28 Oct 2023 18:34:37 +0800
Subject: [PATCH] fix merge conflict

---
 .../eventmesh/webhook/admin/NacosWebHookConfigOperation.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
index 6be40eff4c..a87b43c78e 100644
--- a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
+++ b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
@@ -188,8 +188,6 @@ public List<WebHookConfig> queryWebHookConfigByManufacturer(final WebHookConfig
     }
 
     /**
-     * @param webHookConfig
-     * @return
      * Escape callback path to a valid dataId.
      */
     private String getWebHookConfigDataId(final WebHookConfig webHookConfig) {