Restore line deleted during GitHub conflict fixing by mistake

element-hq · Jan 4, 2022 · 48e15b1 · 48e15b1
1 parent 7bbea52
commit 48e15b1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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*\}