1 files changed, 4 insertions, 0 deletions

diff --git a/example/simple-ex.zig b/example/simple-ex.zig
index f08751b..88598aa 100644
--- a/example/simple-ex.zig
+++ b/example/simple-ex.zig
@@ -30,7 +30,11 @@ pub fn main() !void {
         .diagnostic = &diag,
     }) catch |err| {
         // Report useful error and exit
+<<<<<<< HEAD
+        diag.report(std.io.getStdErr().writer(), err) catch {};
+=======
         diag.report(io.getStdErr().writer(), err) catch {};
+>>>>>>> master
         return err;
     };
     defer args.deinit();