From 2c51ee2ec49cbd83ffd53ac10495eaa887ddf4ae Mon Sep 17 00:00:00 2001 From: ts Date: Tue, 10 Dec 2019 14:32:34 +0000 Subject: [PATCH] Removing git conflict from stretch to test... --- .../utilities/unix/version_control/git/secgen_metadata.xml | 4 ---- scenarios/tests/test_scenario.xml | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/utilities/unix/version_control/git/secgen_metadata.xml b/modules/utilities/unix/version_control/git/secgen_metadata.xml index 5d6438a32..dc325961a 100644 --- a/modules/utilities/unix/version_control/git/secgen_metadata.xml +++ b/modules/utilities/unix/version_control/git/secgen_metadata.xml @@ -15,10 +15,6 @@ https://git-scm.com/ git - - Stretch - - update diff --git a/scenarios/tests/test_scenario.xml b/scenarios/tests/test_scenario.xml index 3b223920b..a38e8e1e5 100644 --- a/scenarios/tests/test_scenario.xml +++ b/scenarios/tests/test_scenario.xml @@ -5,14 +5,13 @@ xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario"> testing - + 172.17.0.0 - - +