merge and resolve conflict in elasticsearch state

This commit is contained in:
m0duspwnens
2021-05-27 11:33:44 -04:00
20 changed files with 129 additions and 252 deletions

View File

@@ -96,7 +96,6 @@ commonpkgs:
- netcat
- python3-mysqldb
- sqlite3
- argon2
- libssl-dev
- python3-dateutil
- python3-m2crypto
@@ -129,7 +128,6 @@ commonpkgs:
- net-tools
- curl
- sqlite
- argon2
- mariadb-devel
- nmap-ncat
- python3