From 552e5ad8006be750c649a7032c72e6ca9025db8c Mon Sep 17 00:00:00 2001
From: Jordan O'Leary <jdoleary@gmail.com>
Date: Sat, 25 Mar 2023 17:03:40 -0400
Subject: [PATCH] src: Resolve merge conflict

---
 build.zig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.zig b/build.zig
index e65c6f4..e3f5408 100755
--- a/build.zig
+++ b/build.zig
@@ -55,6 +55,11 @@ pub fn build(b: *Builder) void {
             .path = "examples/textures/sprite_anim.zig",
             .desc = "Animate a sprite",
         },
+        .{
+            .name = "texture_outline",
+            .path = "examples/shaders/texture_outline.zig",
+            .desc = "Uses a shader to create an outline around a sprite",
+        }
         // .{
         //     .name = "models_loading",
         //     .path = "examples/models/models_loading.zig",