From 6ad2b37cb727d5b64be78f79a4d9a8e0b153280e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leroy=20R=C3=BCgemer?= <lruegeme@techfak.uni-bielefeld.de>
Date: Mon, 17 Jun 2019 09:23:15 +0200
Subject: [PATCH] demoDyn update - merge who&introduce

---
 psGrammar/demos/demoDynamic.jsgf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/psGrammar/demos/demoDynamic.jsgf b/psGrammar/demos/demoDynamic.jsgf
index ec0e3370..6fd28656 100644
--- a/psGrammar/demos/demoDynamic.jsgf
+++ b/psGrammar/demos/demoDynamic.jsgf
@@ -1,14 +1,13 @@
 #JSGF V1.0;
 grammar commands;
 
-public <command> = [<robot>] ( <save> | <wave> | <who> | <goTo> | <followMe> | <followHand> | <gravity> | <exit> | <trash> | <search> | <describe> | <difference>);
+public <command> = [<robot>] ( <introduce> | <save> | <wave> | <goTo> | <followMe> | <followHand> | <gravity> | <exit> | <trash> | <search> | <describe> | <difference>);
 
 <robot> = (tobi | robot | tiago);
 
-<introduce> = (intruduce yourself);
+<introduce> = (intruduce yourself) | (who are you);
 <save> = (save location);
 <wave> = (wait for me);
-<who> = (who are you);
 <goTo> = (go to location);
 <followMe> = (follow me);
 <followHand> = (come with me) | (give me your hand);
-- 
GitLab