Skip to content

Commit 1b145ba

Browse files
committed
Fix merge conflict in .snyk file
2 parents 1a341f6 + e4fa4fb commit 1b145ba

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.snyk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ ignore:
3939
- '*':
4040
reason: Transitive dep of artifactory-papi. Actual papi is provided by artifactory env at runtime so this is a false positive.
4141
created: 2025-09-24T00:00:00.000Z
42-
'SNYK-JAVA-ORGGLASSFISHJERSEYCORE-14049172':
42+
'SNYK-JAVA-COMSQUAREUPOKHTTP3-13961111':
4343
- '*':
4444
reason: Transitive dep of artifactory-papi. Actual papi is provided by artifactory env at runtime so this is a false positive.
45-
created: 2025-12-02T00:00:00.000Z
46-
'SNYK-JAVA-COMSQUAREUPOKHTTP3-13961111':
45+
created: 2025-11-19T00:00:00.000Z
46+
'SNYK-JAVA-ORGGLASSFISHJERSEYCORE-14049172':
4747
- '*':
4848
reason: Transitive dep of artifactory-papi. Actual papi is provided by artifactory env at runtime so this is a false positive.
49-
created: 2025-12-02T00:00:00.000Z
49+
created: 2025-11-19T00:00:00.000Z

0 commit comments

Comments
 (0)