summaryrefslogtreecommitdiff
path: root/playbooks.d/git-server/share/pubkeys.d/tyil@bast-ed25519.pub
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks.d/git-server/share/pubkeys.d/tyil@bast-ed25519.pub')
-rw-r--r--playbooks.d/git-server/share/pubkeys.d/tyil@bast-ed25519.pub5
1 files changed, 5 insertions, 0 deletions
diff --git a/playbooks.d/git-server/share/pubkeys.d/tyil@bast-ed25519.pub b/playbooks.d/git-server/share/pubkeys.d/tyil@bast-ed25519.pub
new file mode 100644
index 0000000..00e492d
--- /dev/null
+++ b/playbooks.d/git-server/share/pubkeys.d/tyil@bast-ed25519.pub
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXhPa+EGS4NySl0YqG38xGEab6uqdimseqq4tlLWyV4 tyil@bast.tyil.net
+=======
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILE1+6HjG3XvLQDHLwnFzq78SEsPTNa8Wu6+inmTMqu7 tyil@bast
+>>>>>>> d8b0063 (Update pubkey for tyil@bast)