Issue #1 feat:masked phone and email related code change

project-sunbird · Sep 26, 2017 · cc7c8a0 · cc7c8a0
1 parent 0444125
commit cc7c8a0
Showing 1 changed file with 0 additions and 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
@@ -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<>();