Fix committed merge conflict for home page.

cake/libs/view/pages/home.ctp

@@ -138,80 +138,6 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 </p>
 
 <ul>
-<<<<<<< HEAD:cake/libs/view/pages/home.ctp
-	<li>
-		<?php
-			echo $this->Html->link(__('Cake Software Foundation', true), 'http://www.cakefoundation.org/');
-		?>
-		<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakePHP', true), 'http://www.cakephp.org');
-		?>
-		<ul><li><?php __('The Rapid Development Framework'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakePHP Documentation', true), 'http://book.cakephp.org');
-		?>
-		<ul><li><?php __('Your Rapid Development Cookbook'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakePHP API', true), 'http://api.cakephp.org');
-		?>
-		<ul><li><?php __('Quick Reference'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('The Bakery', true), 'http://bakery.cakephp.org');
-		?>
-		<ul><li><?php __('Everything CakePHP'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('The Show', true), 'http://live.cakephp.org');
-		?>
-		<ul><li><?php __('The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakePHP Google Group', true), 'http://groups.google.com/group/cake-php');
-		?>
-		<ul><li><?php __('Community mailing list'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('irc.freenode.net #cakephp', true), 'irc://irc.freenode.net/cakephp');
-		?>
-		<ul><li><?php __('Live chat about CakePHP'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakePHP Code', true), 'http://code.cakephp.org/');
-		?>
-		<ul><li><?php __('For the Development of CakePHP (Tickets, Git browser, Roadmap, Changelogs)'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakeForge', true), 'http://www.cakeforge.org');
-		?>
-		<ul><li><?php __('Open Development for CakePHP'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('Book Store', true), 'http://astore.amazon.com/cakesoftwaref-20/');
-		?>
-		<ul><li><?php __('Recommended Software Books'); ?></li></ul>
-	</li>
-	<li>
-		<?php
-			echo $this->Html->link(__('CakePHP gear', true), 'http://www.cafepress.com/cakefoundation');
-		?>
-		<ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul>
-	</li>
-=======
 	<li><a href="http://www.cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
 	<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
 	<li><a href="http://www.cakephp.org"><?php __('CakePHP'); ?> </a>
@@ -236,5 +162,4 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 	<ul><li><?php __('Recommended Software Books'); ?></li></ul></li>
 	<li><a href="http://www.cafepress.com/cakefoundation"><?php __('CakePHP gear'); ?> </a>
 	<ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
->>>>>>> 1.3-alpha:cake/libs/view/pages/home.ctp
 </ul>