fortune: resolve merge conflict

[asd-repo.git] / fortune / files / kiss

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
 %