Merge conflict
This commit is contained in:
parent
fc473b3246
commit
0882eefdff
1 changed files with 1 additions and 10 deletions
|
@ -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
|
||||
.\" -----------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue