Merge branch 'master' of https://github.com/GrammaticalFramework/GF

Conflicts:
	examples/phrasebook/SentencesBul.gf
	examples/phrasebook/WordsBul.gf

1 files changed, 0 insertions, 28 deletions

diff --git a/examples/phrasebook/Greetings.gf b/examples/phrasebook/Greetings.gf
deleted file mode 100644
index 580b1560b..000000000
--- a/examples/phrasebook/Greetings.gf
+++ /dev/null
@@ -1,28 +0,0 @@
-abstract Greetings = Sentences [Greeting] ** {
-
-fun
-  GBye : Greeting ;
-  GCheers : Greeting ;
-  GDamn : Greeting ;
-  GExcuse, GExcusePol : Greeting ;
-  GGoodDay : Greeting ; 
-  GGoodEvening : Greeting ;
-  GGoodMorning : Greeting ;
-  GGoodNight : Greeting ;
-  GGoodbye : Greeting ;
-  GHello  : Greeting ;
-  GHelp : Greeting ;
-  GHowAreYou : Greeting ;
-  GLookOut : Greeting ;
-  GNiceToMeetYou : Greeting ;
-  GPleaseGive, GPleaseGivePol : Greeting ;
-  GSeeYouSoon : Greeting ;
-  GSorry, GSorryPol : Greeting ;
-  GThanks : Greeting ;
-  GTheCheck : Greeting ;
-  GCongratulations : Greeting ;
-  GHappyBirthday : Greeting ;
-  GGoodLuck : Greeting ; 
-  GWhatTime : Greeting ;
-
-}