From 9ed246e43210a0385c430f6ac3086f5fe6ccb469 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 12 Apr 2013 17:51:55 -0400 Subject: [PATCH] Resolve merge conflict. --- docsite/latest/rst/playbooks.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docsite/latest/rst/playbooks.rst b/docsite/latest/rst/playbooks.rst index ed774e29f9..396ab7c047 100644 --- a/docsite/latest/rst/playbooks.rst +++ b/docsite/latest/rst/playbooks.rst @@ -417,8 +417,6 @@ inside another. play are going to get the same tasks. ('only_if' provides some ability for hosts to conditionally skip tasks). -<<<<<<< HEAD:docsite/rst/playbooks.rst -======= Roles ````` @@ -480,7 +478,6 @@ Also, should you wish to parameterize roles, by adding variables, you can do so, - { role: foo_app_instance, dir: '/opt/a', port: 5000 } - { role: foo_app_instance, dir: '/opt/b', port: 5001 } ->>>>>>> Docs on parameterized roles, make document generation output less noisy:docsite/latest/rst/playbooks.rst Executing A Playbook ````````````````````