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

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

1 files changed, 0 insertions, 31 deletions

diff --git a/examples/phrasebook/GreetingsRon.gf b/examples/phrasebook/GreetingsRon.gf
deleted file mode 100644
index 380e8dbc5..000000000
--- a/examples/phrasebook/GreetingsRon.gf
+++ /dev/null
@@ -1,31 +0,0 @@
-concrete GreetingsRon of Greetings = SentencesRon [Greeting,mkGreeting] ** open Prelude in {
-
-flags coding = utf8 ;
-
-lin 
-  GBye = mkGreeting "pa" ;
-  GCheers = mkGreeting "noroc" ;
-  GDamn = mkGreeting "ptiu" ;
-  GExcuse = mkGreeting "pardon" ;
-  GExcusePol = mkGreeting "mă scuzați" ;
-  GGoodDay = mkGreeting "bună ziua" ;
-  GGoodEvening = mkGreeting "bună seara" ;
-  GGoodMorning = mkGreeting "bună dimineaţa" ;
-  GGoodNight = mkGreeting "noapte bună" ;
-  GGoodbye = mkGreeting "la revedere" ;
-  GHello = mkGreeting "salut" ;
-  GHelp = mkGreeting "ajutor" ;
-  GHowAreYou = mkGreeting "ce faci" ;
-  GLookOut = mkGreeting "atenţie" ;
-  GNiceToMeetYou = mkGreeting "încântat" ;
-  GPleaseGive = mkGreeting "te rog" ;
-  GPleaseGivePol = mkGreeting "vă rog" ;
-  GSeeYouSoon = mkGreeting "pe curând" ;
-  GSorry, GSorryPol = mkGreeting "îmi pare rău" ;
-  GThanks = mkGreeting "mulţumesc" ;
-  GTheCheck = mkGreeting "nota de plată" ;
-  GCongratulations = mkGreeting "felicitări";
-  GHappyBirthday = mkGreeting "la mulți ani" ;
-  GGoodLuck = mkGreeting "baftă" ; 
-
-}