From a8a73d4d7e433bf3e9b515c07d1cb3f001688f2d Mon Sep 17 00:00:00 2001
From: Alan Coleman <alanc@udel.edu>
Date: Sat, 9 Mar 2024 14:15:36 +0100
Subject: [PATCH] fix yaml
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5694ce525..9d1460586 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -222,11 +222,7 @@ build_test-clang-14:
junit:
- ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
paths:
-<<<<<<< .gitlab-ci.yml
- ${CI_PROJECT_DIR}/build/build_examples/example_outputs #python tests/examples need this
-=======
- - ${CI_PROJECT_DIR}/build/build_examples/example_outputs/radio_em_shower_outputs #python examples need this
->>>>>>> .gitlab-ci.yml
- ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
- ${CI_PROJECT_DIR}/build/CMakeCache.txt #python tests need this
- ${CI_PROJECT_DIR}/build/bin #python tests need this
--
GitLab