summaryrefslogtreecommitdiff
path: root/cmake-build-debug/Testing/Temporary
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2024-05-09 20:21:38 -0400
committersotech117 <michael_foiani@brown.edu>2024-05-09 20:21:38 -0400
commitac3f1e423e696392ea0a50c2652b829e5c5734b6 (patch)
treeb6ecb80019dae822619079ce34336d34a033f2df /cmake-build-debug/Testing/Temporary
parentf846ddba00aee29675f0bd4f5dbc87a94a422368 (diff)
parent14684344d553dee4b3cc252709716bff927e85b8 (diff)
resolve merge conflicts and attempt to fix local paths
Diffstat (limited to 'cmake-build-debug/Testing/Temporary')
-rw-r--r--cmake-build-debug/Testing/Temporary/LastTest.log4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log
index 2c5f261..713f100 100644
--- a/cmake-build-debug/Testing/Temporary/LastTest.log
+++ b/cmake-build-debug/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: May 04 15:14 EDT
+Start testing: May 09 20:05 EDT
----------------------------------------------------------
-End testing: May 04 15:14 EDT
+End testing: May 09 20:05 EDT