Auto stash before merge of "develop" and "master"
This commit is contained in:
@@ -7,6 +7,7 @@ import dataStructures.KittyGuild;
|
||||
import dataStructures.KittyRating;
|
||||
import dataStructures.KittyRole;
|
||||
import dataStructures.KittyUser;
|
||||
import dataStructures.UserInput;
|
||||
|
||||
public class SubCommandEnd extends SubCommand
|
||||
{
|
||||
@@ -14,7 +15,7 @@ public class SubCommandEnd extends SubCommand
|
||||
public SubCommandEnd(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating); }
|
||||
|
||||
@Override
|
||||
public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input)
|
||||
public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
|
||||
{
|
||||
return new SubCommandFormattable (guild.endPoll());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user