Avoiding merge conflicts

9 years ago · 3e0bfbaea8
parent 12f57804d0
commit 3e0bfbaea8
1 changed files with 1 additions and 5 deletions
--- a/free-programming-books-pt_BR.md
+++ b/free-programming-books-pt_BR.md
@ -129,17 +129,13 @@


 ### 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