Fix build conflicts

Browse source

...

This commit is contained in:

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

parent dfc54a8b92

commit b0cbebdc7b

No known key found for this signature in database

GPG key ID: 401ADFC9891FAAFE

8 changed files with 4 additions and 4 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

Unescape Escape View file