Skip to content

Commit d36728e

Browse files
Prakash SuryaDelphix Engineering
Prakash Surya
authored and
Delphix Engineering
committed
DLPX-87344 Fix kernel merge conflict with upstream
1 parent 700e501 commit d36728e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

debian.oracle-5.15/config/annotations

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Menu: HEADER
22
# FORMAT: 4
3-
# ARCH: amd64 arm64
4-
# FLAVOUR: amd64-oracle arm64-oracle
3+
# ARCH: amd64
4+
# FLAVOUR: amd64-oracle
55

66
include "../../debian.oracle/config/annotations"
77

0 commit comments

Comments
 (0)