Fix build conflicts

Browse Source

...

This commit is contained in:

Aikar

2020-08-30 14:38:49 -04:00

parent a67734d483

commit d417f6d48b

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Spigot-API-Patches/0221-Brand-support.patch → Spigot-API-Patches/0222-Brand-support.patch