diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2021-03-24 22:45:38 +0100 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2021-08-14 12:01:18 +0200 |
| commit | a01ebd521cab6224b09d6c8005c23f16b973048f (patch) | |
| tree | 8c43ef7f92f183066c487d3b7e01c51083a96851 /.ssh/id.d | |
| parent | 1710b686d365e8e2368c421811d09884ff1ab0f8 (diff) | |
Update pubkey for tyil@bast
Diffstat (limited to '.ssh/id.d')
| -rw-r--r-- | .ssh/id.d/tyil@bast-ed25519.pub | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.ssh/id.d/tyil@bast-ed25519.pub b/.ssh/id.d/tyil@bast-ed25519.pub index 9e83e3e..00e492d 100644 --- a/.ssh/id.d/tyil@bast-ed25519.pub +++ b/.ssh/id.d/tyil@bast-ed25519.pub @@ -1 +1,5 @@ +<<<<<<< HEAD ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXhPa+EGS4NySl0YqG38xGEab6uqdimseqq4tlLWyV4 tyil@bast.tyil.net +======= +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILE1+6HjG3XvLQDHLwnFzq78SEsPTNa8Wu6+inmTMqu7 tyil@bast +>>>>>>> d8b0063 (Update pubkey for tyil@bast) |