22a1c1dfb4
In an ideal world, I should have handlded that directly at the conflicting commit in the rebase, but this would have bubbled up through all commits... which I wasn't really quite keen on going through. So here's an extra ugly commit that comes and 'fix the rebase'. |
||
|---|---|---|
| .. | ||
| src | ||
| Cargo.toml | ||