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.

Sign up for GitHub

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

Jump to bottom

JS: Fix merge of 3963 and 3961 #3980

Merged
merged 4 commits into from
Nov 1, 2024
Merged

JS: Fix merge of 3963 and 3961 #3980

merged 4 commits into from
Nov 1, 2024

Conversation

Willy-JL
Copy link
Contributor

@Willy-JL Willy-JL commented Oct 31, 2024 •
edited by skotopes
Loading

What's new

  • Mostly type fixes that had gotten lost due to confusion between conflicting changes

Verification

  • idk

Checklist (For Reviewer)

  • PR has description of feature/bug or link to Confluence/Jira task
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

@Willy-JL Willy-JL marked this pull request as ready for review October 31, 2024 19:39
@skotopes skotopes merged commit 69aa4cd into flipperdevices:dev Nov 1, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skotopes skotopes skotopes approved these changes

@DrZlo13 DrZlo13 Awaiting requested review from DrZlo13 DrZlo13 is a code owner

@hedger hedger Awaiting requested review from hedger hedger is a code owner

@gsurkov gsurkov Awaiting requested review from gsurkov gsurkov is a code owner

@nminaylov nminaylov Awaiting requested review from nminaylov nminaylov is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Willy-JL @skotopes