Zyin055/zyinhud — pull request #11 by RoyCurtis (2014-03-19 19:17:33+00:00)
Title: Item Selector mod (retry)

This pull request re-adds my item selector mod on top of the latest changes (polish translation, health monitor mod). To explain:

> Looking at the current master, it seems my pull request was pulled in, and then the changes undone by the hotkey fixes.

> Generally, the process to handle pull requests locally is to pull the changes on top of your local working directory. Typically this will involve some conflict resolution with some files and code as they may have changed since. Then it should be pushed to GitHub.

To use this pull request:
1. Accept the pull request; the GitHub side of the repo will then gain two new commits (the one in this pull request)
2. On your system, if you have any changes that are uncommited, use the `git stash` feature (or **Commands > Stash** in Git Extensions)
3. Pull all changes from origin, which should include this pull request, and merge them into your working directory
4. Re-save your stash on top of the changes. Ensure to check it does not overwrite the changes from this pull request

Hope this helps; let me know how it goes