From cb6e1af8b225b9055c9e3ebb11e85c2f388cefc8 Mon Sep 17 00:00:00 2001
From: Eric Douglas <eric.douglas.mail@gmail.com>
Date: Sun, 4 Oct 2015 18:05:36 -0300
Subject: [PATCH] Remove conflict text

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 7931637..452c6eb 100644
--- 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.