Commit bc81c2f
committed
fix: integration test and upstream_artifacts bug from merge conflict resolution
Signed-off-by: Abhinav Pradeep <[email protected]>1 parent 93938c3 commit bc81c2f
File tree
2 files changed
+5
-1
lines changed- src/macaron/build_spec_generator/common_spec
- tests/integration/cases/pypi_tree-sitter
2 files changed
+5
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
| 148 | + | |
148 | 149 | | |
149 | 150 | | |
150 | 151 | | |
| |||
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
26 | 29 | | |
0 commit comments