From cc7c8a088131c8bc9f5f35a9703fd3e557ffd967 Mon Sep 17 00:00:00 2001
From: AMIT KUMAR <amit.kumar@tarento.com>
Date: Tue, 26 Sep 2017 11:00:38 +0530
Subject: [PATCH] Issue #1 feat:masked phone and email related code change

---
 .../java/org/sunbird/learner/actors/UserManagementActor.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java b/actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java
index 93df122d9..92cc94b11 100644
--- a/actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java
+++ b/actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java
@@ -203,7 +203,6 @@ private void getUserDetailsByLoginId(Request actorMessage) {
           result.remove(JsonKey.MISSING_FIELDS);
           result.remove(JsonKey.COMPLETENESS);
         }
->>>>>>> 93e9a4948f4a47859b322701aa4caebc29f6f76b
           response.put(JsonKey.RESPONSE, result);
         } else {
           result = new HashMap<>();