-
Notifications
You must be signed in to change notification settings - Fork 105
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
Minor code doc correction #12756
Minor code doc correction #12756
Conversation
* Pre & Post GHK, always try. Doc updated.
This reverts commit 0ee8714.
@@ -496,6 +496,7 @@ public void finish() { | |||
if (GameModule.getGameModule().isMultiplayerConnected()) { | |||
final Command c = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), Resources.getString(GlobalOptions.getInstance().chatterHTMLSupport() ? "PlayerRoster.joined_side_2" : "PlayerRoster.joined_side", GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME), translateSide(newSide))); | |||
c.execute(); | |||
GameModule.getGameModule().getServer().sendToOthers(c); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this change intended to be included?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not really. That change is in PR #12750.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the only commit which should be in this PR is 635bc26, in that case.
Would you be able to drop the other commits? (The simplest way is probably an interactive rebase.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's not what I meant---the unnecessary commits are still there, plus one more which undoes them. What I was asking for was a rebase that takes those commits out of the PR.
File extension = vsav.