Resolve merge conflict

2018-09-27 20:33:13 +02:00
parent d148c26a4c 93818ed28d
commit ee652c9a91
6 changed files with 356 additions and 21 deletions
--- a/Server/Events/Death.cs
+++ b/Server/Events/Death.cs
@@ -7,10 +7,11 @@ using GTANetworkMethods;
 using reallife_gamemode.Model;
 using reallife_gamemode.Server.Extensions;

-/*
- * Author: balbo
- * 
- * */
+/**
+* @overview Life of German Reallife - Events Death (Death.cs)
+* @author VegaZ
+* @copyright (c) 2008 - 2018 Life of German
+*/

 namespace reallife_gamemode.Server.Events
 {