Fix merge conflicts

This commit is contained in:
Alejandro Celaya
2023-09-23 09:06:38 +02:00
32 changed files with 290 additions and 223 deletions

View File

@@ -47,7 +47,6 @@ enum EnvVars: string
case PORT = 'PORT';
case TASK_WORKER_NUM = 'TASK_WORKER_NUM';
case WEB_WORKER_NUM = 'WEB_WORKER_NUM';
case INITIAL_API_KEY = 'INITIAL_API_KEY';
case ANONYMIZE_REMOTE_ADDR = 'ANONYMIZE_REMOTE_ADDR';
case TRACK_ORPHAN_VISITS = 'TRACK_ORPHAN_VISITS';
case DISABLE_TRACK_PARAM = 'DISABLE_TRACK_PARAM';