Fix some merge errors
Compare changes
- Matthew K Defenderfer authored
+ 127
− 27
@@ -4,43 +4,143 @@ set -euxo pipefail
A few merge errors happened during prior commits duplicating some code blocks. I reverted bugfix-change-log-ownership-after-policy-run
back to a prior commit with the correct changes. This still contains all of the changes from !17 (merged), !18 (closed), and !19 (merged).