fortune: add fortunes, update checksums, fix merge

diff --git a/fortune/checksums b/fortune/checksums
index 5a165319a0594a8d8a9240684e356a0ebd1028f5..6ffe8b6ba67869cfabde2db07aa7b6f9aa582b9b 100644 (file)
--- a/fortune/checksums
+++ b/fortune/checksums
@@ -1,3 +1,3 @@
 67fca03590bf4fd2c0da79d2e1ebbecf1806d4e47bd15f32e7ed58778f4a787c
 a218b0db660ff5c26ef3407880fe4e272824bd3ad2336be1af0b673a5f926af9
-b69f8f8cc13445657b6d22d6ae5e6c6dac707d6f70cbd1087f2ad86d6aa56a39
+eac37ce4ea189bca207d49752b2b3b71c9534f8852f5813413a526c91aa5023d

diff --git a/fortune/files/kiss b/fortune/files/kiss
index 13c2199ee013d1c6e3944230ab8e67d5bf034203..cb151456e9f84ee2955d8297ae8751c5cbebd791 100644 (file)
--- a/fortune/files/kiss
+++ b/fortune/files/kiss
@@ -434,6 +434,7 @@ garbage patches
 <@acheam> try finding contributors of this quality anywhere else folks!
 %
 <<<<<<< HEAD
+%
 <midfavila> gotta encrypt it using the strongest cipher
 <midfavila> otherwise known as base64
 %
@@ -523,6 +524,29 @@ of a shape
 %
 <noocsharp> ive always wanted a vibrator for my terminal
 %
-<dilyn> `touch` all the things
+<@dilyn> `touch` all the things
 <necromansy> woah woah hey settle down dilyn
 %
+<@dilyn> merakor: I'll peak at your patch tomorrow and see if I can reproduce
+the issue. what is /bin/sh ?
+<@acheam> wow I never would have though I would have to explain this to you.
+/bin/sh is the path to the posix compliant shell on the system, jeez dilyn
+<kiedtl> *Hopefully* posix compliant
+<kiedtl> but like, the bdfl of a strictly-posix distro having to ask 'what is
+/bin/sh' is just... wow
+<kiedtl> acheam: Can we setup another poll?
+%
+<dilyn> big https://github.com/aabacchus/pp
+<acheam> starred it.
+<phoebos[m]1> dilyn: omg i didn't even know that was there lmao
+<dilyn> let's abuse seo and make this the most viewed github repo
+<acheam> phoebos[m]1: damn big github pro guy
+<mmatongo> thats a big pp
+<kiedtl> wtf is this
+%
+zenomat leaves: Quit: WeeChat 3.1
+<mmatongo> YESSS
+<mmatongo> YESSS
+zenomat arrives in #kisslinux
+<mmatongo> Feel my frustration
+%