From 3e0bfbaea893dfe49d6a0f1a4a965b1d0bb135ce Mon Sep 17 00:00:00 2001 From: Gabriel Gomes Date: Tue, 19 Apr 2016 00:06:49 -0300 Subject: [PATCH] Avoiding merge conflicts --- free-programming-books-pt_BR.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/free-programming-books-pt_BR.md b/free-programming-books-pt_BR.md index f975088e5..29414f177 100644 --- a/free-programming-books-pt_BR.md +++ b/free-programming-books-pt_BR.md @@ -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