Resolved merge conflicts. #17

Open
anomaly wants to merge 15 commits from anomaly/iw6-mod:master into master
First-time contributor
No description provided.
anomaly added 15 commits 2024-12-31 19:17:44 +00:00
This pull request has changes conflicting with the target branch.
  • src/client/component/colors.cpp
  • src/client/game/structs.hpp
  • src/client/game/symbols.hpp

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u master:anomaly-master
git checkout anomaly-master
Sign in to join this conversation.
No Reviewers
No Label
No Milestone
No project
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: alterware/iw6-mod#17
No description provided.