From: Armaan Bhojwani <me@armaanb.net>
Date: Tue, 30 Mar 2021 22:34:50 +0000 (-0400)
Subject: fortune: resolve merge conflict
X-Git-Tag: 2021.07.15-1~158
X-Git-Url: https://git.armaanb.net/?p=asd-repo.git;a=commitdiff_plain;h=0e2be345a3c032fb52134186cfb9bbf2b845bc37

fortune: resolve merge conflict
---

0e2be345a3c032fb52134186cfb9bbf2b845bc37
diff --cc fortune/checksums
index 1090e70,d330259..d995177
--- a/fortune/checksums
+++ b/fortune/checksums
@@@ -1,3 -1,3 +1,8 @@@
  67fca03590bf4fd2c0da79d2e1ebbecf1806d4e47bd15f32e7ed58778f4a787c
++<<<<<<< HEAD
 +a218b0db660ff5c26ef3407880fe4e272824bd3ad2336be1af0b673a5f926af9
 +63045806d109fe5ac6add85f8e22de6a6338dfc9af2c6181ae3987e60ede550f
++=======
+ e81a101a90f6ee70b4702e2e863cdbd7b232576c521e830a63d886e9ea2d267c
+ 5874efad9f4ce3070e558109c720dd203081086b0d7df170efada2d58ec884fa
++>>>>>>> 97436616bdabac6d34093faa8a37b96f65782dc5
diff --cc fortune/files/kiss
index 8c928f3,030b76b..6da51e8
--- a/fortune/files/kiss
+++ b/fortune/files/kiss
@@@ -433,47 -433,3 +433,48 @@@ garbage patche
  <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
 +%
 +<merakor> Nothing quite like the warmth of compiling Webkit on a cold morning
 +%
 +<nxghtmvrx> In EmacsOS with systemd-kerneld everything just works too. You may
 +just switch at this point :p
 +<nxghtmvrx> Its in development for 20+ light years and tools from it used in
 +different OSes so no one can stop you
 +<@dilyn> that's a long distance to be in development
 +<nxghtmvrx> So yeah we measure its development in kilometers. Don't ask why
 +<nxghtmvrx> Well actually that's because of SpaceMacs I think
 +%
 +<@dilyn> oh sweet baby fucking jesus christ
 +%
 +<midfavila> the virgin nxgh vs the chad acheam
 +%
 +<@acheam> tree / | aplay
 +%
 +word of the day: "/usr/etc"
 +%
 +<@acheam> midfavila: what do you mean? .tar iS compression
 +<@acheam> you do know that the .gz and .xz are optional, and only put there by
 +legacy programs, right?
 +%
 +<@dilyn> mfw KISSfoundation is the new Mozilla Foundation
 +%
 +<travankor> CDDL: the copyleft license that bsd people like
 +%
 +A camel is a horse designed by a committee.
 +%
 +This wiki is incomplete, you can help by expanding it!
 +%
 +<AndroUser> Hello world
 +<@acheam> hi AndroUser
 +<kiedtl> ehlo
 +<@dilynm> Hallo
 +<testuser_[m]> hi
 +<M4R10zM0113R> helo
 +<claudia02> hola.
 +<eudaldgr> hola
 +%
 +<@dilynm> I am an abuser
 +%