From bd1fd9569634240c26c9961298b7a4b503cc2c59 Mon Sep 17 00:00:00 2001 From: krasimir Date: Tue, 3 Jun 2008 16:27:21 +0000 Subject: [PATCH] fix conflicts --- src-3.0/GF/Command/Commands.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-3.0/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs index 221a7da02..d1fb4dd4c 100644 --- a/src-3.0/GF/Command/Commands.hs +++ b/src-3.0/GF/Command/Commands.hs @@ -160,7 +160,7 @@ allCommands pgf = Map.fromAscList [ prGrammar opts = case valIdOpts "printer" "" opts of "cats" -> unwords $ categories pgf - v -> prPGF (read v) pgf + v -> prPGF (read v) pgf (prCId (absname pgf)) wordCompletion opts = do let lang = head (optLangs opts)