Merge pull request #1871 from vikrantwiz02/prod/acad-react

vikrantwiz02 · web-flow · commit 76c469282a21 · 2026-03-04T12:55:39.000+05:30
fix: conflict FusionIIIT/applications/globals/api/views.py
diff --git a/FusionIIIT/applications/globals/api/views.py b/FusionIIIT/applications/globals/api/views.py
@@ -699,4 +699,4 @@ def password_reset_reset(request):
         request.META.get("HTTP_X_FORWARDED_FOR", request.META.get("REMOTE_ADDR", "unknown")),
     )
 
-    return Response({"success": True, "message": "Password has been reset successfully."})
+    return Response({"success": True, "message": "Password has been reset successfully."})

Original file line number	Diff line number	Diff line change
`@@ -699,4 +699,4 @@ def password_reset_reset(request):`
`699`	`699`	`request.META.get("HTTP_X_FORWARDED_FOR", request.META.get("REMOTE_ADDR", "unknown")),`
`700`	`700`	`)`
`701`	`701`
`702`		`- return Response({"success": True, "message": "Password has been reset successfully."})`
	`702`	`+ return Response({"success": True, "message": "Password has been reset successfully."})`