jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore line deleted during GitHub conflict fixing by mistake

This commit is contained in:
Benoit Marty 2022-01-04 16:15:25 +01:00
parent 7bbea52e66
commit 48e15b1c36
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/check/forbidden_strings_in_code.txt
View File

@ -32,6 +32,8 @@
import static import static
### Rubbish from merge. Please delete those lines (sometimes in comment) ### Rubbish from merge. Please delete those lines (sometimes in comment)
<<<<<<<
>>>>>>>
### carry return before "}". Please remove empty lines. ### carry return before "}". Please remove empty lines.
\n\s*\n\s*\} \n\s*\n\s*\}