fix merge conflict

scwlkq · Oct 28, 2023 · 3dc506c · 3dc506c
1 parent 16dad0a
commit 3dc506c
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/...k-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java b/...k-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) {