resolving merge conflicts

This commit is contained in:
revol-xut 2022-11-18 16:33:54 +01:00
commit 0a2f59ddc5
No known key found for this signature in database
GPG key ID: 4F56FF7759627D07
7 changed files with 399 additions and 86 deletions

100
keys/pgp/emmanuel.asc Normal file
View file

@ -0,0 +1,100 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
eLb+ljvqhi+8Rw==
=JTAZ
-----END PGP PUBLIC KEY BLOCK-----

52
keys/pgp/sbruder.asc Normal file
View file

@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
R7VFGCA=
=7eg7
-----END PGP PUBLIC KEY BLOCK-----

1
keys/ssh/emmanuel Normal file
View file

@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQKu1EqbSYQXFJ9ZP8E96w72ld24Ta2AfrOTZea4ZFR9jpY5qmVpIHK/CWSey7/2hgpzdy5QiICU4bVz+/WIl0UNKOJGhils+y0dOKqV3M1eSpVvk7LrwO+LowBLpScPm7DZEgGrxckWixcuufOGR67+TsEnftMRTOouPrAM5GpNQoO01tHv5oB8L3G+VbThA3+UiMucKsLgyot7k6+bXBERxTaEffKNFEhI5Isvggn4JO44KqVBx4RPzRrl2GKaRaUH2wF7b2/h+Mz4VXZFzMW01KL8Xx55WDA+waOSLjKrpn1HjoT01QEyM4H3U4DNu+vicikuGb+3BDF+/CFPy/1v/GhdiaK+/Qz9/U1L9aOfrVfjwcL6jfWMu58W7qOdN23aUYLydb+quYS2GroU2/G+D1Es2u2RfGWao7/efhqbDk4JX6+msPnPNeIPXnOk5/t2a0huqHmlcFAs1eQfTGoYb3KHPnxd7Zsxr4MNC2aA62nGGt52+JHmTQ+RdpGFhn71wsFIyruVHbXJYYruinXKlTudWTneJ9X0C8x107Lm9OqV9a6u7yt8EgYZol1rETAvSDWKi+EcO/KrHDX+fME3RaRIX9N8s32ySRKrptRD6iWQrd1Icp2VGwAx8LN7YTcvHmFjUE+aRniTdrs7qRcxORYWKdSxqt2wQhc2Ex7mhQ== emmanuel.diehl@ifsr.de