Resolve merge conflict

This commit is contained in:
VegaZ
2018-10-21 21:35:34 +02:00
4 changed files with 22 additions and 30 deletions

View File

@@ -1280,7 +1280,7 @@ namespace reallife_gamemode.Server.Commands
using (var dbContext = new DatabaseContext())
{
amount = +target.GetUser().GetUserBankAccount(dbContext).Balance;
target.GetUser().GetUserBankAccount(dbContext).Balance += amount;
dbContext.SaveChanges();
}
player.SendChatMessage("~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ gegeben.");