aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2021-03-24 22:45:38 +0100
committerPatrick Spek <p.spek@tyil.nl>2021-08-14 12:01:18 +0200
commita01ebd521cab6224b09d6c8005c23f16b973048f (patch)
tree8c43ef7f92f183066c487d3b7e01c51083a96851
parent1710b686d365e8e2368c421811d09884ff1ab0f8 (diff)
Update pubkey for tyil@bast
-rw-r--r--.ssh/authorized_keys2
-rw-r--r--.ssh/id.d/tyil@bast-ed25519.pub4
2 files changed, 5 insertions, 1 deletions
diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys
index c836ae2..e96de69 100644
--- a/.ssh/authorized_keys
+++ b/.ssh/authorized_keys
@@ -6,7 +6,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMq8zGAmjKlrf1C2VBnYlkpAB8SuVLpgGjFKHXhPO3XM
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICcFE9oQT3s+vLsv4WNKTn3K0ZhntStXdCHfdBPj/62V root@faiwoo
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2UxgdieMtF0a9QXFRb5QVYOwxG9oN1Q85///Y6VCZj root@tyil.email
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAe2Saoh0haEiw+NxTMmqgrr+BMo86OpiKS3IkGNy23C tyil@anoia.tyil.net
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXhPa+EGS4NySl0YqG38xGEab6uqdimseqq4tlLWyV4 tyil@bast.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILE1+6HjG3XvLQDHLwnFzq78SEsPTNa8Wu6+inmTMqu7 tyil@bast
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILQp0puZEEADKgUF1XYtLPzcYLTGNdDj0WCTf37adaZ2 tyil@caeghi.tyil.net
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4sustL8Mw5lQpyuUnmhJgeypvlHy6UFaEKmFCGcltL tyil@denahnu
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHiNIpe2QCOk22YYU/mY7QA2rq0E07wetzj5R1wtWxeC tyil@edephas.tyil.net
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)