fix(test): merge fix correctly

Browse Source

Signed-off-by: Manuel Alonso Gonzalez <434575+manute@users.noreply.github.com>
Signed-off-by: Manuel Alonso Gonzalez <m.alonso@Manuels-MacBook-Pro.local>
(cherry picked from commit 561410ae1d)
Signed-off-by: Scott Rigby <scott@r6by.com>

release-4.1

Manuel Alonso Gonzalez 2 months ago committed by Scott Rigby

parent 6017d2b470

commit 3fc79399c8

No known key found for this signature in database

GPG Key ID: C7C6FBB5B91C1155

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

Diff Content Not Available