Eliminate some unnecessary merge conflicts

hsutter · hsutter · commit 2f3e09807c94 · 2023-12-02T17:00:48.000-08:00
diff --git a/regression-tests/test-results/version b/regression-tests/test-results/version
@@ -1,5 +1,5 @@
 
-cppfront compiler v0.3.0   Build 8C02:1644
+cppfront compiler v0.3.0   Build 8B21:1401
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0
diff --git a/source/build.info b/source/build.info
@@ -1 +1 @@
-"8C02:1644"
+"8B21:1401"
