Skip to content

Conversation

@RAJVEER42
Copy link

This update resolves the merge conflict in README.md by merging content from both time-range-filter and test1 branches. The final version preserves all instructions and adds clarity to the contributing guidelines, setup steps, and feature list. Also ensures users are guided to create PRs against the test1 branch only.

  • Cleaned up conflict markers
  • Merged instructions from both branches
  • Improved formatting and grammar
  • Ensured consistency in steps and terminology

@RAJVEER42
Copy link
Author

@Fenirok I've resolved the issue.
Thank you

@RAJVEER42
Copy link
Author

Hi @Fenirok,

I hope you're doing well. Could you please review and merge my pull request when you have a moment? Let me know if any changes are needed.

Thank you!

@Fenirok
Copy link
Owner

Fenirok commented Jul 2, 2025

give me your name

@RAJVEER42
Copy link
Author

Hi @Fenirok,
My name is Rajveer.
Just wondering — why did you want to know my name?

@Fenirok
Copy link
Owner

Fenirok commented Jul 2, 2025

Hi @Fenirok, My name is Rajveer. Just wondering — why did you want to know my name?

i want the full name which you have used during SSOC registration. Phase 1 scoring has started so i have to give your name, github username etc

@RAJVEER42
Copy link
Author

RAJVEER42 commented Jul 2, 2025

Hi @Fenirok, My name is Rajveer. Just wondering — why did you want to know my name?

i want the full name which you have used during SSOC registration. Phase 1 scoring has started so i have to give your name, github username etc

@Fenirok
full name: Rajveer Bishnoi
Github: @RAJVEER42
Thanks for assigning me this issue.

@Fenirok Fenirok merged commit 4eeeff0 into Fenirok:test1 Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants