diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2020-05-29 10:17:42 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2020-05-29 10:17:42 -0700 |
| commit | 0e6813d084233580774eb7dc043f54999998c223 (patch) | |
| tree | 63f76efaf9abd56ba4048dbf014c0411c1ad8f3f /py/stackctrl.h | |
| parent | 7ea95457eeb67fcaccfa911a4d979fa642262da5 (diff) | |
Fix merge-translate by starting with 'theirs'
Diffstat (limited to 'py/stackctrl.h')
0 files changed, 0 insertions, 0 deletions