Commit c6a8021
committed
Merge remote-tracking branch 'origin/bugfix/10.7.1/alerts-stopping-tag-rules-exception' into bugfix/10.7.1/alerts-stopping-tag-rules-exception
# Conflicts:
# frontend/src/app/data-management/alert-management/alert-rules/alert-rules.component.html
# frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.tsFile tree
1 file changed
+2
-0
lines changed- frontend/src/app/data-management/alert-management/alert-rules
1 file changed
+2
-0
lines changedLines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
| |||
0 commit comments