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

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

1 files changed, 0 insertions, 26 deletions

diff --git a/examples/phrasebook/SentencesTha.gf b/examples/phrasebook/SentencesTha.gf
deleted file mode 100644
index ea5d7fbe9..000000000
--- a/examples/phrasebook/SentencesTha.gf
+++ /dev/null
@@ -1,26 +0,0 @@
-concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [
-    PGreetingMale, PGreetingFemale,
-    GObjectPlease,
-    IMale, YouFamMale, YouFamFemale,
-    ACitizen
-  ] with 
-  (Syntax = SyntaxTha),
-  (Symbolic = SymbolicTha),
-  (Lexicon = LexiconTha) ** open SyntaxTha, (P = ParadigmsTha), (R = ResTha) in {
-
-flags coding=utf8 ;
-lin
-  PGreetingMale g   = mkText (lin Text g) (lin Text (ss "ครับ")) | g ;
-  PGreetingFemale g = mkText (lin Text g) (lin Text (ss "ค่ะ")) | g ;
-
-  GObjectPlease o = 
-    lin Text (mkPhr (lin PConj (ss "ขอ")) (mkUtt o) (lin Voc (ss "หน่อย"))) | lin Text (mkUtt o) ;
-
-  ACitizen p n = mkCl p.name (mkVP (mkCN n (P.personN R.khon_s))) ;
-
-  IMale = mkPerson (R.mkNP "ผม") ;
-  YouFamMale, YouFamFemale = mkPerson (R.mkNP "เธอ") ;
-
-oper
-  thpron = R.thpron ;
-}