From b6ce4b5ff9be68d2f02c84cefd339e7669068946 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Mon, 9 Feb 2026 12:12:23 -0500
Subject: [PATCH] [ssh] Resolve merge conflict

---
 .../ssh/powellc@hungryroot/2026-02-09.gpg         | Bin 0 -> 991 bytes
 ssh/.ssh/authorized_keys                          |   1 +
 ssh/.ssh/powellc@hungryroot.pub                   |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 password-store/.password-store/personal/ssh/powellc@hungryroot/2026-02-09.gpg

diff --git a/password-store/.password-store/personal/ssh/powellc@hungryroot/2026-02-09.gpg b/password-store/.password-store/personal/ssh/powellc@hungryroot/2026-02-09.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..4268dd0384f752c5b5c8e038d41f24c7cf528e69
GIT binary patch
literal 991
zcmV<510ei`0t^FCms>i{cG18A5CE@1o<S+JyW^r|dEBK<D?jEZmNgAj=9dg3Z9-*2
zl64(CRcE@KS22{Qwopb&3R9BiHF_4f!_=d~>0D3VG^7Vmu>27=ZMJH?=!@LxyxnY(
zgOaJJb~FO%YZ?v)`qX$FoG_z*<LT2`X;J}fnF$yj9M<wd{;KM=%xO?3+0xo^#?k5n
z^#TfBV_o&h$yK%45}{e5TV?+^S8R6XAF>w)sR~k(zGv;oo&j?8;<^G3Du2XO`9Qby
zy*8EF{H+%L`$LL3%b!v@$L~&4wL_vM)G$g$4nih<Uk_AgU^Vv>!i=Th`L1b-U;Vak
ztgM68r(oNjsr_MzttyDa8_FPTn>K~fm@W#5orQ{f<TK+aWdIpYsI3zUUIknwF-L8P
znRAWQd)7i^9czqQUB!&)eI#PNmAM&`!R%e`0c(4N(UPAPoAgD4PI3ffQke5Ppo2{!
z0NzjzP7`;{JMH-GN3(qmT|8xorqRYF+-9z4ZCuu7qVef^?3PK=>%mX2a^2>Dva25|
z%(@vIx0Fh5lho-yh5XwhN0k&;Ory=TO1K<AGf*NM*t&^iBW*K`<8Fl!+J?2dMiD4!
zjKpAOi@v3^ymsO!a%v&t?wgU1s=GrCQVzKYYaMk`Btz3o>9JL>RdT-hLdCCiq!5L)
z9%U~Oai7#iOZa?tH6GHz4FN+D^AGzOE7hCtTva=yey85MTSba~{?WMPxvM<EV!4#N
z8Cq^?I~W0(F)oWUR?93DS*{5Jr7eM&%>L!8?$5_bpee{LhC=4g8KGsNwg;KXnXc;O
zaYAFEp#@g}09fMqKI<rKMbw1>YcwX=xsqVBS|^UCay5O_PBkymrLzDC{DYULXE+vK
zrmZv*mj3f6h_mE)vVz`R3*dSK7NszQv6K&qr@(mNy1<>J7Cq;Uyt+y_5&ISMS%V&M
zb`BNNHo(1goSfQ5=1fUwRItp*h96JJbWNE%tUjD~#pN>%iW21%5k_;Z?RGb-0*;Nh
z1$V?J7zi+nDtS1nWnydgpv=`v=eiIQhzq!X6rz~o4|guD*MxsIe)^FYIlaT~Rd!mW
zzYR1Pg5CF)SK|YBnyk<G0&~Izok#^?vkpKjGlMV@z(0DSwYja@&-Sx$Z7N(bzL<>l
zNBn$Ke;?XrBRJnh-mI$YXc@8(lLe_<yco|>9A0GeP4^VXHol!T%|EZaaKlFv2!;aO
z6561hHPA2{Lf>a`0t%!O*W_USyajWPDL0+aGEh0-{f`nXqUG-m6PObH>cqLIPs~a{
N+15W2e8PXE+PLNr;-UZm

literal 0
HcmV?d00001

diff --git a/ssh/.ssh/authorized_keys b/ssh/.ssh/authorized_keys
index ed1eb2e..6044db2 100644
--- a/ssh/.ssh/authorized_keys
+++ b/ssh/.ssh/authorized_keys
@@ -12,3 +12,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBKIdKdzWRNU5MT3pDlLzJRP7g2n4lzmeiA0abBjwJAP
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBU0RREnDvcGOhUnN2fTIrzCibPn4jEUgA+BE7mAYJpl powellc@hungryroot
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHn22uCVWXx7TXgcuGbgXQQ7ZzpMXqpYzBwbrmfUSYtY powellc@iapetus
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrbA71zwH8iMkWV0CwsdTyGwCGWrJSS96O13GZod68T powellc@suttungr
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk0aifjdEhp+kYPYSTy33EdmZi+jbf4ZkLfZWrakiu8 powellc@hungryroot
diff --git a/ssh/.ssh/powellc@hungryroot.pub b/ssh/.ssh/powellc@hungryroot.pub
index f1d5a50..a708f36 100644
--- a/ssh/.ssh/powellc@hungryroot.pub
+++ b/ssh/.ssh/powellc@hungryroot.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBU0RREnDvcGOhUnN2fTIrzCibPn4jEUgA+BE7mAYJpl powellc@hungryroot
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk0aifjdEhp+kYPYSTy33EdmZi+jbf4ZkLfZWrakiu8 powellc@hungryroot