mirror of
https://github.com/prowler-cloud/prowler.git
synced 2026-07-24 04:51:51 +00:00
chore: resolve conflicts
This commit is contained in:
-4
@@ -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": ""
|
||||
|
||||
Reference in New Issue
Block a user