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

Comment out new ScamWarning #5042

Merged
merged 1 commit into from
May 30, 2024
Merged

Comment out new ScamWarning #5042

merged 1 commit into from
May 30, 2024

Conversation

Jon-edge
Copy link
Collaborator

@Jon-edge Jon-edge commented May 30, 2024

Pending further refinement

CHANGELOG

Does this branch warrant an entry to the CHANGELOG?

  • Yes
  • No

Dependencies

none

Requirements

If you have made any visual changes to the GUI. Make sure you have:

  • Tested on iOS device
  • Tested on Android device
  • Tested on small-screen device (iPod Touch)
  • Tested on large-screen device (tablet)

Copy link
Contributor

@swansontec swansontec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have done git revert 8d0046702fcc1672bf433c647ef66ebd0c425e8a, since that's a cleaner change that doesn't need to be reviewed, but I guess commenting it out works too.

Pending further refinement
@Jon-edge
Copy link
Collaborator Author

Yeah I just tried that command, there were a bunch of conflicts so this is still easier

@Jon-edge Jon-edge merged commit f90f98c into develop May 30, 2024
2 checks passed
@Jon-edge Jon-edge deleted the jon/revert-scam-warning branch May 30, 2024 19:21
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