nyrn
/
openclaw
mirror of https://github.com/openclaw/openclaw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: remove discord setup rebase marker

This commit is contained in:
Peter Steinberger 2026-03-17 00:01:17 -07:00
parent 3dec814fda
commit 73ca53ee02
No known key found for this signature in database
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/discord/src/setup-surface.ts
View File

@ -100,7 +100,6 @@ async function resolveDiscordGroupAllowlist(params: {
});
}
<<<<<<< HEAD
export const discordSetupWizard: ChannelSetupWizard = createDiscordSetupWizardBase({
promptAllowFrom: promptDiscordAllowFrom,
resolveAllowFromEntries: async ({ cfg, accountId, credentialValues, entries }) =>