fortune: resolve merge conflict

diff --git a/fortune/checksums b/fortune/checksums
index 1090e7066aed9dad6384b2d091962966f48ce18a..d9951779785095f2739dfa5acdc95455dfc2ebab 100644 (file)
--- a/fortune/checksums
+++ b/fortune/checksums
@@ -1,3 +1,8 @@
 67fca03590bf4fd2c0da79d2e1ebbecf1806d4e47bd15f32e7ed58778f4a787c
+<<<<<<< HEAD
 a218b0db660ff5c26ef3407880fe4e272824bd3ad2336be1af0b673a5f926af9
 63045806d109fe5ac6add85f8e22de6a6338dfc9af2c6181ae3987e60ede550f
+=======
+e81a101a90f6ee70b4702e2e863cdbd7b232576c521e830a63d886e9ea2d267c
+5874efad9f4ce3070e558109c720dd203081086b0d7df170efada2d58ec884fa
+>>>>>>> 97436616bdabac6d34093faa8a37b96f65782dc5

diff --git a/fortune/files/kiss b/fortune/files/kiss
index 8c928f38a13284d9f732069a842c8bf017e38e37..6da51e8eaea485f15b975edbc8b7abea1263ed8e 100644 (file)
--- a/fortune/files/kiss
+++ b/fortune/files/kiss
@@ -433,6 +433,7 @@ garbage patches
 <merakor> All my mails were "I got it this time I'm so sorry"
 <@acheam> try finding contributors of this quality anywhere else folks!
 %
+<<<<<<< HEAD
 <midfavila> gotta encrypt it using the strongest cipher
 <midfavila> otherwise known as base64
 %