test: fix bad merge (#18267)

Browse Source

PR Close #18267

...

This commit is contained in:

Victor Berchet 2017-07-20 17:09:20 -07:00 committed by Miško Hevery

parent fd0cc01eed

commit e0a9625e46

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files