]> git.armaanb.net Git - asd-repo.git/commit
fortune: resolve merge conflict
authorArmaan Bhojwani <me@armaanb.net>
Tue, 30 Mar 2021 22:34:50 +0000 (18:34 -0400)
committerArmaan Bhojwani <me@armaanb.net>
Tue, 30 Mar 2021 22:34:50 +0000 (18:34 -0400)
commit0e2be345a3c032fb52134186cfb9bbf2b845bc37
tree4235e269c6147b3b441a4bfc9f34e7543bbcb3eb
parenta9f06f18467314fefd31a6edccd8ba6858b13737
parent97436616bdabac6d34093faa8a37b96f65782dc5
fortune: resolve merge conflict
fortune/checksums
fortune/files/kiss