From e9f7b28f2f8f36ea53838c369c305fab63daa20f Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Thu, 6 Feb 2025 09:55:08 +0000
Subject: [PATCH] Mark generated files as generated

Being prompted to manually merge conflicts in generated files is very annoying, and also wrong - the correct thing to do is re-run the generator script and get fresh output after each change
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 37ada446..febd2839 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,6 @@
 /.gitattributes export-ignore
 /.github export-ignore
 /.gitignore export-ignore
-/.travis.yml.old export-ignore
 /CONTRIBUTING.md export-ignore
 /docker-compose.yml export-ignore
 /generator export-ignore
@@ -10,3 +9,4 @@
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
 /tests export-ignore
+/generated/**/*.php -merge linguist-generated=true