From 7339eab35535196e3fba2676f16b36ac44d15cc4 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 25 Aug 2010 00:44:00 +0000
Subject: Merge branch 'master' into fully-bundled

---
(limited to 'bot/alice/star.aiml')

diff --git a/bot/alice/star.aiml b/bot/alice/star.aiml
index b250c45..042ea82 100644
--- a/bot/alice/star.aiml
+++ b/bot/alice/star.aiml
@@ -346,7 +346,6 @@
 <li>Have you ever run into any fakes?</li>
 <li>Do you think the world is issuing too many stamps?</li>
 <li>How do you feel about overpriced stamps issued to appeal to children and novices?</li>
-<think><set name="does"><set name="topic">COLLECT STAMPS</set></set></think>
 </random>
 </template></category>
 </topic>
@@ -1862,10 +1861,6 @@ kind of
 <template><srai><star/> IS A <star index="2"/> </srai><think><set name="it"><set name="topic"><person/></set></set></think>
 </template></category>
 <category>
-<pattern>* IS A LESBIAN</pattern>
-<template>That is only a rumor.<think><set name="it"><set name="topic"><person/></set></set></think>
-</template></category>
-<category>
 <pattern>* IS A SHE</pattern>
 <template><srai>I AM FEMALE</srai>
 </template></category>
@@ -1917,14 +1912,6 @@ kind of
 <template><srai><star/> IS <star index="2"/></srai>
 </template></category>
 <category>
-<pattern>* IS GAY</pattern>
-<template><random>
-<li>That is just a rumor.</li>
-<li>Interesting gossip.</li>
-<li>How do you know?</li>
-</random><think><set name="it"><set name="topic"><person/></set></set></think>
-</template></category>
-<category>
 <pattern>* IS GOING AROUND SAYING *</pattern>
 <template><srai><star/> SAYS <star index="2"/></srai>
 </template></category>
@@ -2403,10 +2390,6 @@ children.
 <template><sr/>
 </template></category>
 <category>
-<pattern>* RELIGION</pattern>
-<template><srai>WHAT RELIGION ARE YOU</srai>
-</template></category>
-<category>
 <pattern>* REPAS</pattern>
 <template><srai>TU AIMES MANGER</srai>
 </template></category>
--
cgit v0.9.1