prathimacode-hub / FarmArk

πŸ’‘πŸ·FarmArk is an app designed for facilitation of farmers and addressing them with all the needed farming solutions for their greens to prosper and excel. πŸ™Œ
https://prathimacode-hub.github.io/FarmArk/
GNU General Public License v3.0
7 stars 8 forks source link

Carousel Feature Added with dummy data #22

Closed Aankirz closed 1 year ago

Aankirz commented 1 year ago

Carousel Feature Added

Screenshots

Screenshot 2022-10-27 at 834 48 PM Screenshot 2022-10-27 at 8 35 04 PM
welcome[bot] commented 1 year ago

Hello there! πŸ‘‹ Welcome to the project! πŸ’– Thank you and congrats πŸŽ‰ for opening your first pull request. Please adhere to our Code of Conduct. πŸ™ŒπŸ» We will get back to you as soon as we can. πŸ˜„

Feel free to get in touch with me through social media handles. Hope to see you there!πŸ˜„

Aankirz commented 1 year ago

No, I didn't 🧐

Isha307 commented 1 year ago

No, I didn't 🧐

Yeah, I understood. The Problem is you hadn't updated the repo before creating the PR that's why it is creating conflict. Please update the repo and create a fresh PR :)

Aankirz commented 1 year ago

Ok :\

Aankirz commented 1 year ago

@Isha307 now I have resolved the footer part, Thank u for reviewing it :)

Isha307 commented 1 year ago

@Isha307 now I have resolved the footer part, Thank u for reviewing it :)

Still, I'm not able to merge it due to some conflict, please create a fresh PR :P

Aankirz commented 1 year ago

Yeah, I understood. The Problem is you hadn't updated the repo before creating the PR that's why it is creating conflict. Please update the repo and create a fresh PR :)

Ig because of my mistake for not upd there's a conflict, but I'm unable to create a fresh pr, there's another soln u can "resolve " conflicts as a collaborator, since the code is correct.

Screenshot 2022-10-28 at 9 33 36 PM
Isha307 commented 1 year ago

Yeah, I understood. The Problem is you hadn't updated the repo before creating the PR that's why it is creating conflict. Please update the repo and create a fresh PR :)

Ig because of my mistake for not upd there's a conflict, but I'm unable to create a fresh pr, there's another soln u can "resolve " conflicts as a collaborator, since the code is correct.

Screenshot 2022-10-28 at 9 33 36 PM

I have closed this PR, now u can update and create a new one :D