Restore line deleted during GitHub conflict fixing by mistake

2022-01-04 16:15:25 +01:00 · 2022-01-04 16:15:25 +01:00 · 48e15b1c36
parent 7bbea52e66
commit 48e15b1c36
1 changed files with 2 additions and 0 deletions
--- 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*\}