From d2d76c2ed1a04a685221df6882464d65a29a273e Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 18 May 2022 01:36:48 +0000 Subject: [PATCH] Fix unmerged files --- pkg/deb/master_changelog | 3 --- pkg/rpm/keydb_build/keydb.spec | 4 ---- 2 files changed, 7 deletions(-) diff --git a/pkg/deb/master_changelog b/pkg/deb/master_changelog index 5c90577c0..d3bf48042 100644 --- a/pkg/deb/master_changelog +++ b/pkg/deb/master_changelog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= keydb (6:6.3.0-1distribution_placeholder) codename_placeholder; urgency=medium * This release open sources KeyDB Enterprise features into the open source project along with PSYNC for active replication @@ -14,7 +12,6 @@ keydb (6:6.3.0-1distribution_placeholder) codename_placeholder; urgency=medium -- Ben Schermel Wed, 11 May 2022 20:00:37 +0000 ->>>>>>> public/main keydb (6:6.2.2-1distribution_placeholder) codename_placeholder; urgency=medium * Acquire lock in module.cpp to fix module test break diff --git a/pkg/rpm/keydb_build/keydb.spec b/pkg/rpm/keydb_build/keydb.spec index 9cdb16a03..2fa4ae557 100755 --- a/pkg/rpm/keydb_build/keydb.spec +++ b/pkg/rpm/keydb_build/keydb.spec @@ -27,11 +27,7 @@ getent group keydb &> /dev/null || \ groupadd -r keydb &> /dev/null getent passwd keydb &> /dev/null || \ useradd -r -g keydb -d /var/lib/keydb -s /sbin/nologin \ -<<<<<<< HEAD --c 'KeyDB Enterprise Database Server' keydb &> /dev/null -======= -c 'KeyDB Database Server' keydb &> /dev/null ->>>>>>> public/main exit 0 #postinstall scriptlet (using /bin/sh):