Fixed merge conflicts

2019-04-14 16:37:10 +01:00
parent ccdd077a4c 8e9ea0b506
commit e025ba8eb1
1 changed files with 1 additions and 1 deletions
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -505,7 +505,7 @@
 					chem_temp += (C.ThermicConstant * stepChemAmmount)
 					pH += (C.HIonRelease * stepChemAmmount)

-					// End
+					// End.

 					selected_reaction.on_reaction(src, multiplier, special_react_result)