Duplicates #274
Aims to fix the merge conflicts change requested in the original PR.
Seems to have been inactive for a bit and wanted to resolve the conflicts so that they can be tested.
Questions (please complete the following information):
Have you personally loaded this code into an updated qbcore project and checked all it's functionality? [no] (I simply just fixed the conflicts so that they can be tested.)
Does your code fit the style guidelines? [yes]
Does your PR fit the contribution guidelines? [yes]
Describe Pull request
Duplicates #274 Aims to fix the merge conflicts change requested in the original PR. Seems to have been inactive for a bit and wanted to resolve the conflicts so that they can be tested.
Questions (please complete the following information):