From 2e87640572134b7fe3eab2e5066ef72fbe559b77 Mon Sep 17 00:00:00 2001 From: Coding-Dev-Tools Date: Tue, 30 Jun 2026 02:39:57 -0400 Subject: [PATCH] improve: remove merge conflict artifacts from .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index d714515..9063c18 100644 --- a/.gitignore +++ b/.gitignore @@ -71,7 +71,6 @@ Thumbs.db research/ fixtures/generated/ .ruff_cache/ -<<<<<<< Updated upstream .secrets.baseline # Merge artifacts and cache (added by workspace stabilization) @@ -85,8 +84,6 @@ fixtures/generated/ *.REMOTE.* local.db *.sqlite3 -======= # Added by release-prep node_modules ->>>>>>> Stashed changes