Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolved conflict #165

Merged
merged 6 commits into from
Jan 14, 2025
Merged

resolved conflict #165

merged 6 commits into from
Jan 14, 2025

Conversation

Shristi0124
Copy link
Contributor

@Shristi0124 Shristi0124 commented Jan 3, 2025

Issue: #1

first adding actor
add 2 hit films
add 2 flop films

Screenshot 2025-01-04 002304
Screenshot 2025-01-04 002538
Screenshot 2025-01-04 002745

@Opencodeiiita-Bot
Copy link

Hey @Shristi0124

PR Template is not followed. Kindly follow the template & edit it again for consideration as a valid pull request.
The template required is
Issue: #<ISSUE NUMBER>

Thanks for contributing in OpenCode'24 ✨✨!

@Shristi0124
Copy link
Contributor Author

Screenshot 2025-01-04 002304
Screenshot 2025-01-04 002745
Screenshot 2025-01-04 002538

@Opencodeiiita-Bot
Copy link

Hey @Shristi0124

Thanks for opening this PR 🚀. Mentor will review your pull request soon and till then, keep contributing and stay calm.

Thanks for contributing in OpenCode'24 ✨✨!

@Shristi0124 Shristi0124 closed this Jan 3, 2025
@Shristi0124 Shristi0124 reopened this Jan 3, 2025
@Shivg2901 Shivg2901 merged commit 04614b1 into opencodeiiita:main Jan 14, 2025
@Opencodeiiita-Bot
Copy link

Hey @Shristi0124

Your PR has been merged 🥳🥳 and you have earned 10 points.

Thanks for contributing in OpenCode'24 ✨✨

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants