Skip to content

Commit e8dd820

Browse files
committed
Resolve migration conflict
Signed-off-by: ziad hany <ziadhany2016@gmail.com>
1 parent 47af107 commit e8dd820

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

vulnerabilities/improvers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
enhance_with_metasploit as enhance_with_metasploit_v2,
3232
)
3333
from vulnerabilities.pipelines.v2_improvers import flag_ghost_packages as flag_ghost_packages_v2
34-
from vulnerabilities.pipelines.v2_improvers import sigma_rules
3534
from vulnerabilities.pipelines.v2_improvers import relate_severities
35+
from vulnerabilities.pipelines.v2_improvers import sigma_rules
3636
from vulnerabilities.pipelines.v2_improvers import unfurl_version_range as unfurl_version_range_v2
3737
from vulnerabilities.utils import create_registry
3838

vulnerabilities/migrations/0106_detectionrule.py renamed to vulnerabilities/migrations/0116_detectionrule.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Generated by Django 4.2.25 on 2025-12-16 13:02
1+
# Generated by Django 5.2.11 on 2026-03-07 14:44
22

3-
from django.db import migrations, models
43
import django.db.models.deletion
4+
from django.db import migrations, models
55

66

77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
("vulnerabilities", "0105_packagecommitpatch_patch_and_more"),
10+
("vulnerabilities", "0115_impactedpackageaffecting_and_more"),
1111
]
1212

1313
operations = [

0 commit comments

Comments
 (0)