From 4c2e415118a451c8cf6f46d296e16a2711169ead Mon Sep 17 00:00:00 2001
From: sotech117 <michael_foiani@brown.edu>
Date: Wed, 13 Dec 2023 16:10:56 -0500
Subject: fix merge

---
 cmake-build-release/Testing/Temporary/LastTest.log | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake-build-release/Testing')

diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log
index 836e679..b3d2774 100644
--- a/cmake-build-release/Testing/Temporary/LastTest.log
+++ b/cmake-build-release/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Dec 13 15:35 EST
+Start testing: Dec 13 16:09 EST
 ----------------------------------------------------------
-End testing: Dec 13 15:35 EST
+End testing: Dec 13 16:09 EST
-- 
cgit v1.2.3-70-g09d2