secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ssh] Resolve merge conflict

Browse Source
This commit is contained in:
Colin Powell
2026-02-09 12:12:23 -05:00
parent 69976709a7
commit b6ce4b5ff9
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
password-store/.password-store/personal/ssh/powellc@hungryroot/2026-02-09.gpg Normal file
View File

Binary file not shown.

1
ssh/.ssh/authorized_keys
View File

@ -12,3 +12,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBKIdKdzWRNU5MT3pDlLzJRP7g2n4lzmeiA0abBjwJAP
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBU0RREnDvcGOhUnN2fTIrzCibPn4jEUgA+BE7mAYJpl powellc@hungryroot ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBU0RREnDvcGOhUnN2fTIrzCibPn4jEUgA+BE7mAYJpl powellc@hungryroot
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHn22uCVWXx7TXgcuGbgXQQ7ZzpMXqpYzBwbrmfUSYtY powellc@iapetus ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHn22uCVWXx7TXgcuGbgXQQ7ZzpMXqpYzBwbrmfUSYtY powellc@iapetus
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrbA71zwH8iMkWV0CwsdTyGwCGWrJSS96O13GZod68T powellc@suttungr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrbA71zwH8iMkWV0CwsdTyGwCGWrJSS96O13GZod68T powellc@suttungr
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk0aifjdEhp+kYPYSTy33EdmZi+jbf4ZkLfZWrakiu8 powellc@hungryroot

2
ssh/.ssh/powellc@hungryroot.pub
View File

@ -1 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBU0RREnDvcGOhUnN2fTIrzCibPn4jEUgA+BE7mAYJpl powellc@hungryroot ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk0aifjdEhp+kYPYSTy33EdmZi+jbf4ZkLfZWrakiu8 powellc@hungryroot