Skip to content

Merge conflict#5

Merged
bhupendra9211 merged 2 commits into
masterfrom
merge_conflict
May 15, 2024
Merged

Merge conflict#5
bhupendra9211 merged 2 commits into
masterfrom
merge_conflict

Conversation

@bhupendra9211
Copy link
Copy Markdown
Owner

PR to close at the same time

  • URL

Changes

List changes you made

  1. resolving merge conflict

Explain why you made those changes

  1. Because we no longer need the column with the new feature implemented in this PR

Checklist

  • No conflict?
  • Postman request added if new endpoint's implemented?
    • If no, reason:
  • Spec added for new feature?
    • If no, reason:
  • Spec passed?
    • If no, reason:
  • Lint your code?
    • If no, reason:
  • Tested in a shared environment?
    • If no, reason:

Environment to test

  • local env
  • testing
  • staging

Steps to reproduce

Points to reviews

  • things reviewers need to look into

Evidence

Before

After

poudelmadhav and others added 2 commits May 15, 2024 11:15
* update gems

* Add current url option in development.rb closes#3

* checkout changed to v4 for workflow

* update node version and donot run test on draft pr
@bhupendra9211 bhupendra9211 merged commit 87a370d into master May 15, 2024
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.

2 participants