chore: resolve conflicts

This commit is contained in:
HugoPBrito
2025-12-09 17:22:02 +01:00
parent d203741be7
commit abae74bfa8
@@ -23,13 +23,9 @@
"Url": "https://docs.aws.amazon.com/network-firewall/latest/developerguide/vpc-config.html"
}
},
<<<<<<< HEAD
"Categories": [],
=======
"Categories": [
"trust-boundaries"
],
>>>>>>> 01fe379b5 (fix: remove incorrect `threat-detection` category from checks (#9489))
"DependsOn": [],
"RelatedTo": [],
"Notes": ""