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

fix(items): conflicts with qbx_medical #116

Merged
merged 1 commit into from
Dec 1, 2024
Merged

fix(items): conflicts with qbx_medical #116

merged 1 commit into from
Dec 1, 2024

Conversation

mafewtm
Copy link
Member

@mafewtm mafewtm commented Nov 23, 2024

Description

  • We currently have an item in qbx_ambulancejob/qbx_medical which uses the bandage item and this conflicts with that.

Checklist

  • I have personally loaded this code into an updated Qbox project and checked all of its functionality.
  • My pull request fits the contribution guidelines & code conventions.

@mafewtm mafewtm merged commit 1ad30f1 into main Dec 1, 2024
4 checks passed
@mafewtm mafewtm deleted the fix-bandage branch December 1, 2024 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@D4isDAVID D4isDAVID D4isDAVID approved these changes

@Manason Manason Manason approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@mafewtm @Manason @D4isDAVID