Apply prepare changes

BotellaA · github-actions[bot] · commit f3699255cdb9 · 2024-10-24T11:58:49.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 tests/** linguist-vendored
+bindings/python/requirements.txt merge=ours
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,2 @@
+[merge "ours"]
+    driver = true

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`tests/** linguist-vendored`
	`2`	`+bindings/python/requirements.txt merge=ours`