Skip to content

Commit

Permalink
DLPX-87344 Fix kernel merge conflict with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Prakash Surya authored and Delphix Engineering committed Sep 3, 2023
1 parent 270a0b6 commit 74bc4bf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions debian.aws-5.15/config/annotations
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Menu: HEADER
# FORMAT: 4
# ARCH: amd64 arm64
# FLAVOUR: amd64-aws arm64-aws
# ARCH: amd64
# FLAVOUR: amd64-aws

include "../../debian.aws/config/annotations"

Expand Down

0 comments on commit 74bc4bf

Please sign in to comment.