From 48e15b1c36a25a3a00ab3d1b7338fe3e40b5ce3b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 Jan 2022 16:15:25 +0100
Subject: [PATCH] Restore line deleted during GitHub conflict fixing by mistake

---
 tools/check/forbidden_strings_in_code.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 2698429b13..7b869e8cd2 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -32,6 +32,8 @@
 import static
 
 ### Rubbish from merge. Please delete those lines (sometimes in comment)
+<<<<<<<
+>>>>>>>
 
 ### carry return before "}". Please remove empty lines.
 \n\s*\n\s*\}