valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Mike Place 2017-06-22 15:36:21 -06:00
parent 7697d0d1d2
commit 048befb5fe
No known key found for this signature in database
GPG Key ID: 9136F4F13705CFD3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/client/test_runner.py
View File

@ -133,8 +133,6 @@ class RunnerModuleTest(TestCase, AdaptedConfigurationTestCaseMixin):
'quuz': 'on',
},
})
<<<<<<< HEAD:tests/integration/client/test_runner.py
=======
def test_invalid_kwargs_are_ignored(self):
low = {