From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Tue, 15 Dec 2009 11:29:12 +0000 (+0000)
Subject: fix conflict
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=131ad3f909d19eacd146b0bae2c69d60c742cf3f;p=irc.git

fix conflict
---

131ad3f909d19eacd146b0bae2c69d60c742cf3f
diff --cc trouts
index eb7fee5,30847ba..c0d4d8c
--- a/trouts
+++ b/trouts
@@@ -181,3 -182,5 +181,4 @@@ forces %s to listen to David Cameron's 
  sticks %s in a small room with Ian Paisley
  rains she-trolls down upon %s
  rains wheelbarrows on %s
 -nominates %s for the UK Usenet Committee
+ hits %s with a replica of Milan cathedral