Repository navigation
Commit f4c42f6
committed
merge: resolve 0.7.7 conflicts with master (Release/0.7.6 #35)
Conflict resolution between release/0.7.7 (T4 per-call context for
/gate) and origin/master (Release/0.7.6 #35, which bumped the SDK
to 0.7.6):
* pyproject.toml: keep 0.7.7 (the HEAD side). 0.7.6 on master is
superseded by 0.7.7 once this merges.
* CHANGELOG.md: keep BOTH the new 0.7.7 block (from HEAD) and the
0.7.6 block (from master). They document different releases and
are listed in chronological order with the older 0.7.6 block below.
* src/nullrun/{__init__.py, runtime.py, transport.py}: auto-merged
cleanly - master doesn't touch the T4 hunks.
Auto-merge result equals HEAD, but the merge commit is still
needed to record the parent relationship and clear the conflict
state on the PR.1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
0 commit comments