fixed merge issues

DShield-ISC · Oct 18, 2023 · d572523 · d572523
2 parents 5ec52cc + d9c2ce2
commit d572523
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@ etc/dshield.ini
 srv/dshield/lastweblogtime.txt
 env/
 poetry.lock
-.venv/
+.venv/
+srv/isc-agent/requirements.txt
diff --git a/srv/isc-agent/requirements.txt b/srv/isc-agent/requirements.txt