From d251e68ac50ac7db8d7e1a48b43ebbd6d73f7559 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 26 Feb 2013 20:57:36 -0500 Subject: [PATCH] Resolve merge --- library/file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/file b/library/file index 5b0c1f8162..8091e4d7f5 100644 --- a/library/file +++ b/library/file @@ -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,