fix conflict

diff --git a/trouts b/trouts
index 30847baecee51e0f64caa1a6ecc5df0ca33b86e1..c0d4d8cc4e85033c46f8b5ac01aef301e8a27f42 100644 (file)
--- a/trouts
+++ b/trouts
@@ -152,7 +152,6 @@ compiles %s with -trigraphs
 compiles %s with -Wtrigraphs
 turns %s into dogfood
 ><> ><> %s
-sets %s and robhu up on a blind date
 gently taps %s with a menhir
 invests all of %s's money in a high-grade structured credit strategy enhanced leverage fund
 plays the viola at %s
@@ -182,5 +181,4 @@ forces %s to listen to David Cameron's speeches
 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