adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix committed merge conflict for home page.

Browse source
This commit is contained in:
predominant 2009-11-05 14:30:56 +11:00
parent 380b49a446
commit 2669b6179f
1 changed files with 0 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
cake/libs/view/pages/home.ctp
View file

@ -138,80 +138,6 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
</p> </p>
<ul> <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> <li><a href="http://www.cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li> <ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
<li><a href="http://www.cakephp.org"><?php __('CakePHP'); ?> </a> <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> <ul><li><?php __('Recommended Software Books'); ?></li></ul></li>
<li><a href="http://www.cafepress.com/cakefoundation"><?php __('CakePHP gear'); ?> </a> <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> <ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
>>>>>>> 1.3-alpha:cake/libs/view/pages/home.ctp
</ul> </ul>