From a1974a8114c1e6fd5939f767e26fcb7b003fec2e Mon Sep 17 00:00:00 2001
From: Reinier van der Leer <pwuts@agpt.co>
Date: Wed, 3 Jul 2024 12:25:31 -0600
Subject: [PATCH] merge forge/.gitattributes into .gitattributes

---
 .gitattributes       | 3 +++
 forge/.gitattributes | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 forge/.gitattributes

diff --git a/.gitattributes b/.gitattributes
index f18b519846cb..c025026c544d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,6 @@ frontend/build/** linguist-generated
 **/poetry.lock linguist-generated
 
 docs/_javascript/** linguist-vendored
+
+# Exclude VCR cassettes from stats
+forge/tests/vcr_cassettes/**/**.y*ml linguist-generated
diff --git a/forge/.gitattributes b/forge/.gitattributes
deleted file mode 100644
index 6d75e23b07a1..000000000000
--- a/forge/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-# Exclude VCR cassettes from stats
-tests/vcr_cassettes/**/**.y*ml linguist-generated