resolve merge conflicts

This commit is contained in:
Johnny Amancio
2026-03-20 12:18:26 +01:00
29 changed files with 1010 additions and 585 deletions
+5
View File
@@ -8,6 +8,11 @@
"options": {},
},
},
"permission": {
"edit": {
"packages/opencode/migration/*": "deny",
},
},
"mcp": {},
"tools": {
"github-triage": false,