Pulled code
Merge branch 'master' of https://git.imagnate.com/repo/imgKFarms
Merge branch 'master' of https://github.com/priyanka-techmaes/kisanfarms
pulled code
pulled code
Merge branch 'master' of https://github.com/priyanka-techmaes/kisanfarms
Merge branch 'master' of https://github.com/priyanka-techmaes/kisanfarms
pushing conflicted files from cach folder