Atualiza arquivo README.md

cerebrobr · Dec 12, 2015 · 005f15c · 005f15c
1 parent c98fff4
commit 005f15c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@
 ### [Javacript](https://github.com/cerebrobr/livros/tree/master/JavaScript/)
 - [Eloquent JavaScript - 2ª Edição](http://eloquentjavascript.com.br/)
 
-<<<<<<< HEAD
 #### [jQuery](https://github.com/cerebrobr/livros/tree/master/JavaScript/Jquery)
 - [Fundamentos de jQuery](https://github.com/cerebrobr/livros/blob/master/JavaScript/Jquery/jquery-fundamentals-book-pt-BR.pdf)
 
@@ -26,10 +25,6 @@
 ### [Web](https://github.com/cerebrobr/livros/tree/master/Web)
 - [Caelum HTML, CSS, Javascript, PHP](https://github.com/cerebrobr/livros/tree/master/Web)
 
-
-
-=======
 ## Como contribuir
 
 Siga as instruções de como contribuir [deste link](https://github.com/cerebrobr/cerebro/blob/master/CONTRIBUTING.md).
->>>>>>> refs/remotes/cerebrobr/master