Commited by priyanka
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into register-user-checkout
Pulled code
Pulled code
Resolved conflict
done edit functionality