From 0882eefdff933391be40644890d453927685849f Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 3 Jan 2014 11:06:32 -0500 Subject: [PATCH] Merge conflict --- docs/man/man1/ansible-pull.1 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/man/man1/ansible-pull.1 b/docs/man/man1/ansible-pull.1 index 6d75a3cc5ea..fb727631ebf 100644 --- a/docs/man/man1/ansible-pull.1 +++ b/docs/man/man1/ansible-pull.1 @@ -7,16 +7,7 @@ .\" Source: Ansible 1.5 .\" Language: English .\" -.TH "ANSIBLE" "1" "01/02/2014" "Ansible 1\&.5" "System administration commands" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' +.TH "ANSIBLE" "1" "01/03/2014" "Ansible 1\&.5" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" -----------------------------------------------------------------