From fb4c8b35e5d24861f76c0ef375cfd22305040a8c Mon Sep 17 00:00:00 2001
From: radhikap <radhika.puthiyetath@citrix.com>
Date: Tue, 27 Aug 2013 11:31:45 +0530
Subject: [PATCH] vpc review comments

---
 docs/en-US/add-loadbalancer-rule-vpc.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/en-US/add-loadbalancer-rule-vpc.xml b/docs/en-US/add-loadbalancer-rule-vpc.xml
index 618d7b9ed22..3c164c2140e 100644
--- a/docs/en-US/add-loadbalancer-rule-vpc.xml
+++ b/docs/en-US/add-loadbalancer-rule-vpc.xml
@@ -387,6 +387,9 @@
           >physical_network_name</emphasis>&gt; > <emphasis role="bold">Network Service
           Providers</emphasis> > <emphasis role="bold">Internal LB VM</emphasis>. You can manage the
         Internal LB VMs as and when required from the location.</para>
+<<<<<<< HEAD
+>>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
+=======
 >>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
       <orderedlist>
         <listitem>
@@ -421,11 +424,14 @@
                 that can be displayed to users.</para>
             </listitem>
             <listitem>
+<<<<<<< HEAD
 <<<<<<< HEAD
               <para><emphasis role="bold">Source IP Address</emphasis>: The source IP from which
                 traffic originates. Typically, this is the IP of an instance on another tier within
                 your VPC.</para>
 =======
+=======
+>>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
               <para><emphasis role="bold">Source IP Address</emphasis>: (Optional) The source IP
                 from which traffic originates. The IP is acquired from the CIDR of that particular
                 tier on which you want to create the Internal LB rule. If not specified, the IP