2 files changed, 8 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();
diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index 41efd1f..32d44c4 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -39,7 +39,11 @@ pub fn main() !void {
     // Because we use a streaming parser, we have to consume each argument parsed individually.
     while (parser.next() 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;
     }) |arg| {
         // arg.param will point to the parameter which matched the argument.