From 199b9429adcdfcfb4c7e4ade005b5b580a89303f Mon Sep 17 00:00:00 2001
From: journal_froid <moi@plusdenomdedommaine.com>
Date: Fri, 23 Jan 2026 09:51:32 +0100
Subject: [PATCH] nmap_sA

---
 usr/bin/nmap_sA | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/usr/bin/nmap_sA b/usr/bin/nmap_sA
index bc25e1e..a98376e 100755
--- a/usr/bin/nmap_sA
+++ b/usr/bin/nmap_sA
@@ -1,10 +1,6 @@
 #!/bin/bash
 nmap_sA () 
 { 
-<<<<<<< HEAD
     nmap -Pn -sA --reason $@
-=======
-    nmap -sA --reason -Pn
->>>>>>> d4ee7bf (modified:   alpine-qemu-install)
 }
 nmap_sA "$@"