summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraarne <aarne@chalmers.se>2014-08-30 23:13:39 +0000
committeraarne <aarne@chalmers.se>2014-08-30 23:13:39 +0000
commit4e8cd9119efb1abb5797f86fd932dd5fb488a58e (patch)
treebb59dceeba99665369d855271bbe8c49985d9177
parentd3d1d20a8abff15d35c188a22d0ecb77b63351fc (diff)
by_Prep causing conflict in AppChi, therefore excluded from the import of PhrasebookChi
-rw-r--r--examples/app/AppChi.gf2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf
index 611153a10..e889b0554 100644
--- a/examples/app/AppChi.gf
+++ b/examples/app/AppChi.gf
@@ -26,7 +26,7 @@ concrete AppChi of App =
-- Extensions
]
- ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep]
+ ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
** open ParadigmsChi, SyntaxChi, Prelude in {