wip

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>

authentik/root/test_runner.py

@@ -7,11 +7,8 @@ from unittest import TestCase
 import pytest
 from django.conf import settings
 from django.test.runner import DiscoverRunner
-<<<<<<< HEAD
 from django.test.testcases import apps
-=======
 from structlog.stdlib import get_logger
->>>>>>> main
 
 from authentik.lib.config import CONFIG
 from authentik.lib.sentry import sentry_init

web/src/admin/system-tasks/ScheduleList.ts

@@ -153,6 +153,8 @@ export class ScheduleList extends Table<Schedule> {
     }
 
     renderExpanded(item: Schedule): TemplateResult {
+        // TODO: no hardcoded things
+        // grep authentik_tasks_schedules.schedule gen-ts-api
         return html` <td role="cell" colspan="3">
             <div class="pf-c-table__expandable-row-content">
                 <div class="pf-c-content">