Fix mismerge.

This commit is contained in:
Bård Skaflestad 2013-05-06 12:31:13 +02:00
parent bc547f82c6
commit e9a1aa2a99

View File

@ -450,5 +450,5 @@ int main()
std::cout << "Saturation solution:\n"
<< "function s1 = solution\n"
<< "s1 = [\n" << s1 << "\n]\n";
<< "s1 = [\n" << sw1 << "\n]\n";
}