Merge remote-tracking branch 'origin/master'

# Conflicts: # paydayHealth.cs
2018-05-15 10:04:36 +02:00 · 2018-05-15 10:04:36 +02:00 · f5227096a6
commit f5227096a6
parent 08e430e275 2020cc3eb0
1 changed files with 1 additions and 1 deletions
--- a/paydayHealth.cs
+++ b/paydayHealth.cs
@ -12,7 +12,7 @@ namespace pdHealth
 			this.Tick += new EventHandler(this.doHealthTick);
 		}
 		
-		//Settings:
+		//Settings:a
 		int tickTime = 100;			//Tick-Rate in ms.
 		
 		//Regeneration