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/S.aiml')

diff --git a/bot/alice/S.aiml b/bot/alice/S.aiml
index 13a2dec..660fd78 100644
--- a/bot/alice/S.aiml
+++ b/bot/alice/S.aiml
@@ -239,10 +239,6 @@
 <template><srai>My name is Sarah</srai>
 </template></category>
 <category>
-<pattern>SATAN *</pattern>
-<template><srai>WHO IS SATAN</srai>
-</template></category>
-<category>
 <pattern>SAURAIS TU ME DONNER *</pattern>
 <template><srai>TU PEUX ME DONNER <star/></srai>
 </template></category>
@@ -2567,10 +2563,6 @@ Of a bicycle built for two.<br/>
 <template><srai>HOW BIG ARE YOU</srai>
 </template></category>
 <category>
-<pattern>STEINBOCK</pattern>
-<template>Ich bin Schuetze, genau wie Christian.
-</template></category>
-<category>
 <pattern>STEPHANIE</pattern><that>WHAT CAN I CALL YOU</that>
 <template><think><set name="gender">she</set></think> <srai>MY NAME IS STEPHANIE</srai>
 </template></category>
--
cgit v0.9.1