Conflicts resolved in 3 files: - plugin-marketplace.ts: take main's createRequire approach, keep isAbsolute fix - plugin-scaffold.ts: take main's newline escaping (superset of backslash fix) - plugin.test.ts: take main's importOriginal pattern Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| ao | ||
| cli | ||
| core | ||
| integration-tests | ||
| plugins | ||
| web | ||