aseemk98
diff --git a/‎build/built-jar.properties‎
Lines changed: 1 addition & 5 deletions b/‎build/built-jar.properties‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$1.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$1.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$2.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$2.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$3.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$3.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$4.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$4.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$5.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$5.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$6.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$6.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword$7.class‎
0 Bytes b/‎build/classes/ForgotPassword/ForgotPassword$7.class‎
0 Bytes
diff --git a/‎build/classes/ForgotPassword/ForgotPassword.class‎
390 Bytes b/‎build/classes/ForgotPassword/ForgotPassword.class‎
390 Bytes
diff --git a/‎build/classes/ForgotPassword/SendMailTLS$1.class‎
809 Bytes b/‎build/classes/ForgotPassword/SendMailTLS$1.class‎
809 Bytes
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#Wed, 19 Sep 2018 14:14:05 +0530
-=======
-#Fri, 21 Sep 2018 08:40:01 +0530
->>>>>>> baea9c2fab422b31210864ca61c8b2a8ce7076b3
+#Fri, 28 Sep 2018 09:55:20 +0530
 
 
 D\:\\SDL\\InventoryManagement=