mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-24 03:26:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Restore line deleted during GitHub conflict fixing by mistake

Browse source
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
### Rubbish from merge. Please delete those lines (sometimes in comment)
<<<<<<<
>>>>>>>
### carry return before "}". Please remove empty lines.
\n\s*\n\s*\}