From: matthew <matthew>
Date: Tue, 5 Feb 2002 16:36:11 +0000 (+0000)
Subject: Fixed a slight RCS merge collision
X-Git-Tag: upstream_0_3~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=bfc3be9d611cd6eae3e24b2b08fc3ca30743398e;p=irc.git

Fixed a slight RCS merge collision
---

diff --git a/trouts b/trouts
index 0cb2f13..26a359f 100644
--- a/trouts
+++ b/trouts
@@ -4,6 +4,7 @@ sacrifices %s to dark gods.
 bites his thumb at %s.
 replaces %s with a 2-line shell script
 takes off and nukes %s from orbit
+treats %s with the contempt they deserve
 grumbles sonorously at %s
 offers %s a one way ticket to Mars
 decapitates %s