Resolve merge
This commit is contained in:
parent
113db71bf6
commit
980949baba
1 changed files with 1 additions and 1 deletions
2
file
2
file
|
@ -140,7 +140,7 @@ def main():
|
||||||
argument_spec = dict(
|
argument_spec = dict(
|
||||||
state = dict(choices=['file','directory','link','absent'], default='file'),
|
state = dict(choices=['file','directory','link','absent'], default='file'),
|
||||||
path = dict(aliases=['dest', 'name'], required=True),
|
path = dict(aliases=['dest', 'name'], required=True),
|
||||||
recurse = dict(default='no', type='bool')
|
recurse = dict(default='no', type='bool'),
|
||||||
diff_peek = dict(default=None)
|
diff_peek = dict(default=None)
|
||||||
),
|
),
|
||||||
add_file_common_args=True,
|
add_file_common_args=True,
|
||||||
|
|
Loading…
Reference in a new issue