Resolve merge

2013-02-26 20:57:36 -05:00 · 2013-02-26 20:57:36 -05:00 · 980949baba
commit 980949baba
parent 113db71bf6
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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,