Commit ed30c38
fix: resolve semantic merge conflicts from refine-plan + zenus/main merge
- Fix heredoc delimiter mismatch in loop-codex-stop-hook.sh (opening
AGENT_TEAMS_FALLBACK_EOF vs closing WORKTREE_TEAMS_FALLBACK_EOF)
- Update codex-worker.sh to use renamed DEFAULT_CODEX_MODEL/EFFORT
variables from refine-plan's loop-common.sh (was DEFAULT_CODEX_WORKER_*)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent 03a4cc9 commit ed30c38
2 files changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1867 | 1867 | | |
1868 | 1868 | | |
1869 | 1869 | | |
1870 | | - | |
| 1870 | + | |
1871 | 1871 | | |
1872 | 1872 | | |
1873 | 1873 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
| 40 | + | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| |||
0 commit comments