fix merge conflict

djrtwo · djrtwo · commit fb1d9e7abd18 · 2018-12-27T07:23:04.000-06:00
diff --git a/tests/beacon/state_machines/test_validation.py b/tests/beacon/state_machines/test_validation.py
@@ -52,7 +52,6 @@ def test_validate_proposer_signature(
         validator_registry=[
             mock_validator_record(
                 pubkey=proposer_pubkey,
-                max_deposit=0,
             )
             for _ in range(10)
         ],

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ def test_validate_proposer_signature(`
`52`	`52`	`validator_registry=[`
`53`	`53`	`mock_validator_record(`
`54`	`54`	`pubkey=proposer_pubkey,`
`55`		`- max_deposit=0,`
`56`	`55`	`)`
`57`	`56`	`for _ in range(10)`
`58`	`57`	`],`