From a284a4027629c14ed1dbc485b9aa448406e0acfd Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Fri, 25 Mar 2022 16:37:30 +0000 Subject: [PATCH] Squashed 'src/' changes from 15e9e21c..f676db22 f676db22 Merge commit 'e0b04393edfc68bc3bf689e45b4196b165a1ab0a' e0b04393 Squashed 'phreeqcpp/' changes from ba27ef1..8715a91 git-subtree-dir: src git-subtree-split: f676db2278b9f1992fd01b5d03f8137d286fa172 --- phreeqcpp/pitzer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phreeqcpp/pitzer.cpp b/phreeqcpp/pitzer.cpp index 0b5db899..f2b6a92f 100644 --- a/phreeqcpp/pitzer.cpp +++ b/phreeqcpp/pitzer.cpp @@ -214,7 +214,7 @@ pitzer_tidy(void) if (mcb0 == NULL && mcb1 == NULL && mcc0 == NULL && ICON == TRUE) { error_string = sformatf( - "No KCl interaction parameters, turning off MacInnis scaling."); + "No KCl interaction parameters, turning off MacInnes scaling."); warning_msg(error_string); ICON = FALSE; }