From d278087cb0f574f43cbdefd6a5f2db2e5305d5f1 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Sat, 6 Oct 2018 17:57:40 +0000 Subject: [PATCH] merge elf information --- zpm-merge | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/zpm-merge b/zpm-merge index ada48aa..aa2b71f 100755 --- a/zpm-merge +++ b/zpm-merge @@ -134,11 +134,11 @@ where PF.pkgid = '$pkgid' on conflict (hash) do nothing ; + EOS fi # scripts -# actual files if [ $mergescripts -eq 1 ]; then cat<