ivabus/pantry
1
0
Fork 0
mirror of https://github.com/ivabus/pantry synced 2024-11-22 08:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

how come I can commit merge annotations?

Browse source
This commit is contained in:
Max Howell 2023-11-21 08:21:26 -05:00
parent c1e0efc929
commit 41959997b5
No known key found for this signature in database
GPG key ID: 741BB84EF5BB9EEC
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
projects/gnupg.org/gpg
View file

@ -5,16 +5,10 @@ etc="$d/../etc/gnupg"
export GNUPGHOME="${GNUPGHOME:-"$etc"}" export GNUPGHOME="${GNUPGHOME:-"$etc"}"
<<<<<<< HEAD
mkdir -p "$etc"
chmod 700 "$etc"
cat << EOF > "$etc"/gpg.conf
=======
if [ ! -f "$etc/gpg.conf" ]; then if [ ! -f "$etc/gpg.conf" ]; then
mkdir -p "$etc" mkdir -p "$etc"
chmod 700 "$etc" chmod 700 "$etc"
cat << EOF > "$etc"/gpg.conf cat << EOF > "$etc"/gpg.conf
>>>>>>> 055bba74 (deps on `*` considered harmful)
use-agent use-agent
pinentry-mode loopback pinentry-mode loopback
agent-program $d/gpg-agent agent-program $d/gpg-agent