Skip to content

🍒 Cherry pick PR #33943 to staging 🍒#33948

Closed
os-botify[bot] wants to merge 3 commits into
stagingfrom
Julesssss-cherry-pick-staging-33943-1
Closed

🍒 Cherry pick PR #33943 to staging 🍒#33948
os-botify[bot] wants to merge 3 commits into
stagingfrom
Julesssss-cherry-pick-staging-33943-1

Conversation

@os-botify

@os-botify os-botify Bot commented Jan 4, 2024

Copy link
Copy Markdown

🍒 Cherry pick #33943 to staging 🍒

OSBotify and others added 2 commits January 4, 2024 12:44
(cherry picked from commit d5f5856)
[NO QA] Fix consistent-type-imports lint warning

(cherry picked from commit 011e31c)
@os-botify os-botify Bot requested a review from a team as a code owner January 4, 2024 12:44
@os-botify

os-botify Bot commented Jan 4, 2024

Copy link
Copy Markdown
Author

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@melvin-bot melvin-bot Bot requested review from stitesExpensify and removed request for a team January 4, 2024 12:45
@melvin-bot

melvin-bot Bot commented Jan 4, 2024

Copy link
Copy Markdown

@stitesExpensify Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@Julesssss

Copy link
Copy Markdown
Contributor

I believe the conflict is resolved. The PR that caused this conflict seems to have reverted a recently migrated typescript file back to js.

  • modified imports in the js file commit
  • the TS migration commit I used as reference

@Julesssss Julesssss closed this Jan 4, 2024
@Julesssss

Copy link
Copy Markdown
Contributor

Discussed here, it didn't need to be CP'd

@Julesssss Julesssss deleted the Julesssss-cherry-pick-staging-33943-1 branch April 21, 2025 22:27
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