Merge pull request #969 from aap-sc/aap-sc/final_november_2023_upstream_sync_fixup

Browse Source

fix erroneously-resolved merge conflict

...

This commit is contained in:

Tim Newsome 2023-11-30 12:18:33 -08:00 committed by GitHub

parent e9484bab54 10af616067

commit d4c5d26570

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files