1
0
mirror of https://github.com/namibia/free-programming-books.git synced 2024-05-29 04:20:50 +00:00

Avoiding merge conflicts

This commit is contained in:
Gabriel Gomes 2016-04-19 00:06:49 -03:00
parent 12f57804d0
commit 3e0bfbaea8

View File

@ -125,21 +125,17 @@
### Perl
* [Perl Básico](https://github.com/HeitorG/Perl-Brasil/blob/master/apostilas/perl-basico.pdf) - Heitor Gouvea (PDF)
* [Perl Básico](https://github.com/HeitorG/Perl-Brasil/blob/master/apostilas/perl-basico.pdf) - Heitor Gouvea (PDF)
### Php
<<<<<<< HEAD
* [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf)
* [PHP Do jeito certo](http://br.phptherightway.com/)
* [Laravel - O Framework PHP para os Artesãos da Web](http://laravel.artesaos.org/)
* [CakePHP](http://book.cakephp.org/2.0/pt/index.html)
=======
* [A semana PHP](http://asemanaphp.com.br).
* [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf) (PDF)
* [PHP Do jeito certo](http://br.phptherightway.com)
>>>>>>> upstream/master
### Python