From 3f002feffb57c87bf0b73c019d5fec4faa9cbea2 Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Sun, 22 Mar 2026 18:46:51 -0700 Subject: [PATCH] fix(plugins): remove metadata generator conflict markers --- scripts/generate-bundled-plugin-metadata.mjs | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/generate-bundled-plugin-metadata.mjs b/scripts/generate-bundled-plugin-metadata.mjs index ed3a05030e6..7dd67308acd 100644 --- a/scripts/generate-bundled-plugin-metadata.mjs +++ b/scripts/generate-bundled-plugin-metadata.mjs @@ -8,10 +8,7 @@ const GENERATED_BY = "scripts/generate-bundled-plugin-metadata.mjs"; const DEFAULT_OUTPUT_PATH = "src/plugins/bundled-plugin-metadata.generated.ts"; const MANIFEST_KEY = "openclaw"; const FORMATTER_CWD = path.resolve(import.meta.dirname, ".."); -<<<<<<< HEAD const OXFMT_BIN = path.join(FORMATTER_CWD, "node_modules", ".bin", "oxfmt"); -======= ->>>>>>> 521b33dd85 (fix(plugins): make metadata generator formatter portable) const CANONICAL_PACKAGE_ID_ALIASES = { "elevenlabs-speech": "elevenlabs", "microsoft-speech": "microsoft",