From d8c7f5843f1c63f43a0842d3db762c2e2cc80c59 Mon Sep 17 00:00:00 2001
From: Harivansh Rathi <rathiharivansh@gmail.com>
Date: Fri, 6 Mar 2026 12:05:25 -0800
Subject: [PATCH] gitig

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7b88789e..97ef0478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,10 @@ pi-*.html
 out.html
 packages/coding-agent/binaries/
 todo.md
+<<<<<<< Updated upstream
 
 # Riptide artifacts (cloud-synced)
 .humanlayer/tasks/
+=======
+.humanlayer
+>>>>>>> Stashed changes