Commit d251e68a by Michael DeHaan

Resolve merge

parent 1366c663
...@@ -140,7 +140,7 @@ def main(): ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment