resoved conflicts in home file
Resolved bug of showcase
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into develop
Pulled code
Pulled code
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into develop
Changed code as per comment
Done with reply from admin functionality
Done with adding bulk products to cart
Pulled code
working on add to cart button on list view
resolved conflicts in files