Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unmerge item-info expansion #6281

Merged
merged 1 commit into from
Feb 24, 2014
Merged

Conversation

KA101
Copy link
Contributor

@KA101 KA101 commented Feb 24, 2014

I merged it, didn't realize that there'd be a problem with small terminal sizes, so here's the cleanup. My apologies, all. As requested in, and fixes, #6274.

Revert "Merge branch 'iteminfo' of https://github.com/goron111/Cataclysm-DDA into goron111-iteminfo"

This reverts commit 4a852cc, reversing
changes made to 9f88213.

And I designated a trial branch for a reason. Let's see if I needed it! (Looks like I didn't for that reason. Makes the PR easier to do, though.)

…ysm-DDA into goron111-iteminfo"

This reverts commit 4a852cc, reversing
changes made to 9f88213.

And I designated a trial branch for a reason.  Let's see if I needed it!
@kevingranade kevingranade merged commit 1462a9d into CleverRaven:master Feb 24, 2014
@KA101 KA101 deleted the revert-trial branch February 24, 2014 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants