From 67d40dd144303626c94263f7bbb6571e8c735d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julia=20Kr=C3=BCger?= <juliakbln@gmail.com>
Date: Thu, 4 Jul 2024 11:04:36 +0200
Subject: [PATCH] chore: increase conflict marker size for .rst

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index dae59aa844a..9cd3992297e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@
 *.gpg  binary generated
 *.bmp  binary
 *.base64 generated
+*.rst conflict-marker-size=100
 
 # Mark files as "generated", i.e. no license applies to them.
 # This includes output from programs, directive lists generated by grepping