From 1ae6b6d811ec6ca691d3022b9ff0605e27dfdbf9 Mon Sep 17 00:00:00 2001
From: Gabriela Navarro <navarro1703@gmail.com>
Date: Wed, 24 Sep 2014 12:47:23 +0000
Subject: [PATCH] Fix user registration feature

---
 features/user_registration.feature | 1 -
 1 file changed, 0 insertions(+), 1 deletion(-)

diff --git a/features/user_registration.feature b/features/user_registration.feature
index ff453e9..2e0dd5f 100644
--- a/features/user_registration.feature
+++ b/features/user_registration.feature
@@ -204,7 +204,6 @@ Feature: User Registration
     And I fill in "Password" with "secret"
     And I press "Log in"
     Then I should see "Complete Profile: 37%"
->>>>>>> a8e75c7... corrections: remove area of interest from forms.
 
   @selenium
   Scenario: Remove the incomplete resgistration percentage message
--
libgit2 0.21.2