Remove conflict text

2015-10-04 18:05:36 -03:00 · 2015-10-04 18:05:36 -03:00 · cb6e1af8b2
parent eba15e4ef5
commit cb6e1af8b2
1 changed files with 0 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -49,7 +49,6 @@ Course|Files
 Course Name| [link]()
 ```

-<<<<<<< HEAD
 **IMPORTANT**: add your profile **once** and **after** you **finish** each course you can **return** here and **update** your comment.

 **ps**: In the *Completed Courses* section, you should link the repository that contains the files that you created in the respective course.