tree b4f4ab0471f3811c38c7517cd7ef4c6bbfb0c0cc
parent 2933cf243a3d04cfb67ccfcc28e54bbe5019cbad
author marination <maricadsouza221197@gmail.com> 1643697948 +0530
committer marination <maricadsouza221197@gmail.com> 1643697948 +0530

fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931