From b26e90f980da3dd951c068cad6aeb146cecec923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alonso=20C=C3=A1rdenas?= Date: Thu, 1 Jun 2023 21:01:04 -0500 Subject: [PATCH] Fix conflicts --- atomics/T1046/T1046.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atomics/T1046/T1046.yaml b/atomics/T1046/T1046.yaml index 2474d934..09cc55c0 100644 --- a/atomics/T1046/T1046.yaml +++ b/atomics/T1046/T1046.yaml @@ -24,7 +24,7 @@ atomic_tests: description: | Scan ports to check for listening ports with Nmap. - Upon successful execution, sh will utilize nmap, telnet, and nc to contact a single or range of adresseses on port 80 to determine if listening. Results will be via stdout. + Upon successful execution, sh will utilize nmap, telnet, and nc to contact a single or range of addresses on port 80 to determine if listening. Results will be via stdout. supported_platforms: - linux - macos @@ -74,7 +74,7 @@ atomic_tests: description: | Scan ports to check for listening ports with Nmap. - Upon successful execution, sh will utilize nmap, telnet, and nc to contact a single or range of adresseses on port 80 to determine if listening. Results will be via stdout. + Upon successful execution, sh will utilize nmap, telnet, and nc to contact a single or range of addresses on port 80 to determine if listening. Results will be via stdout. supported_platforms: - freebsd input_arguments: