diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch b/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch index ed5d8a7dac..1a48db63c6 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch | |||
| @@ -20,7 +20,7 @@ This caused the system to only permit a binary comparison - "new preferred" or | |||
| 20 | else comparison the system will now perform a 'last-in-wins' resolution when | 20 | else comparison the system will now perform a 'last-in-wins' resolution when |
| 21 | "neither is preferred". | 21 | "neither is preferred". |
| 22 | 22 | ||
| 23 | Upstream-Status: Pending | 23 | Upstream-Status: Submitted [RPM5 maintainer] |
| 24 | 24 | ||
| 25 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 25 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 26 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 26 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |