Resolve merge

reviewable/pr18780/r1
Michael DeHaan 12 years ago
parent 113db71bf6
commit 980949baba

@ -140,7 +140,7 @@ def main():
argument_spec = dict(
state = dict(choices=['file','directory','link','absent'], default='file'),
path = dict(aliases=['dest', 'name'], required=True),
recurse = dict(default='no', type='bool')
recurse = dict(default='no', type='bool'),
diff_peek = dict(default=None)
),
add_file_common_args=True,

Loading…
Cancel
Save