Closed ZeusJunior closed 4 years ago
Yay. Conflicts
It was merged in https://github.com/NetroScript/backpack.tf-miscellaneous-extensions/commit/12a48339ea956d0f7f8d83be8fb32ce017d8fffb but I had to fix the newline encoding (because the web version of solving conflicts replaced all CRLF with LF) and that commit did merge not this pull request. Well for the future it would be far better to rebase it against the master and also squash the commits.
1