Skip to content

Instantly share code, notes, and snippets.

@aikar

aikar/gist:9001bc4d8982cc2ae1da

Created July 7, 2014 22:27
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save aikar/9001bc4d8982cc2ae1da to your computer and use it in GitHub Desktop.
Save aikar/9001bc4d8982cc2ae1da to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Applying: Allow Disabling of Command Logging
fatal: sha1 information is lacking or useless (src/main/java/net/minecraft/server/PlayerConnection.java).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0032 Allow Disabling of Command Logging
The copy of the patch that failed is found in:
/store/home/aikar/projects/emc/spigot/Spigot-Server/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment