zig fmt: Fix merge errors

7841c9b7d1Lachlan Easton committed on 9/1/2020, 11:59:27 AMparent671b3ab
1 file changedLine totals unavailable