fix(docs): rectify merge committed in dns doc

Author: mboersma

docs/managing_deis/configure-dns.rst

@@ -6,17 +6,10 @@
 Configure DNS
 =============
 
-<<<<<<< HEAD
 For Deis clusters on Amazon Web Services, Azure, DigitalOcean, Google Compute Engine,
 Linode, OpenStack, or bare metal, :ref:`DNS records <dns_records>` must be created.
 The cluster runs multiple routers infront of the Deis controller and apps
 you deploy, so a :ref:`load balancer <configure-load-balancers>` is recommended.
-=======
-For Deis clusters on AWS, GCE, Azure, DigitalOcean, OpenStack, or bare metal,
-:ref:`DNS records <dns_records>` must be created. The cluster runs multiple routers in
-front of the Deis controller and apps you deploy, so a
-:ref:`load balancer <configure-load-balancers>` is recommended.
->>>>>>> chore(contrib/ec2): rename ec2 to aws
 
 Vagrant
 -------