Update version conflict #47
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merging activity type
debugger permissions removal
Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com>
version numbers
merging whitelist to staging
* removed * removed icon * Rename LICENSE to LICENSE.MD * Create LICENSE * removed wrong license * Update LICENSE (#22)
ritesh-cs
approved these changes
Dec 18, 2025
Harman-rd
added a commit
that referenced
this pull request
Dec 18, 2025
* Removed icon * Rename LICENSE to LICENSE.MD * Create LICENSE * removed wrong license * Update LICENSE (#22) * Tracking enhancements, Logs and UI Bug Fixing #39 (#40) * Issue 39 staging conflict fix (#42) * Remove debugger permission (#12) Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com> * adjusting versions (#18) * Merging in license (#23) * removed * removed icon * Rename LICENSE to LICENSE.MD * Create LICENSE * removed wrong license * Update LICENSE (#22) --------- Co-authored-by: David Messinger <dmessing@users.noreply.github.com> Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com> * Update version conflict (#46) * - remove debugger permission (#12) Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com> * adjusting versions (#18) * Merging in license (#23) * removed * removed icon * Rename LICENSE to LICENSE.MD * Create LICENSE * removed wrong license * Update LICENSE (#22) --------- Co-authored-by: David Messinger <dmessing@users.noreply.github.com> Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com> * Update version conflict (#47) * - remove debugger permission (#12) Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com> * adjusting versions (#18) * Merging in license (#23) * removed * removed icon * Rename LICENSE to LICENSE.MD * Create LICENSE * removed wrong license * Update LICENSE (#22) --------- Co-authored-by: David Messinger <dmessing@users.noreply.github.com> Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com> --------- Co-authored-by: David Messinger <dmessing@users.noreply.github.com> Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve the conflict with static/manifest.json