diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-12-09 18:36:59 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-12-09 18:36:59 +0000 |
| commit | ef55b7453303a9a2b20590815c967d044a13da1d (patch) | |
| tree | 948eaac8dcc2bfdff77ca367ea8ff058cda8c109 /templates/option-conflict.tmpl | |
| parent | 3fb9c47ea669977c856ad82b3ea593ec76d136ec (diff) | |
| download | cups-ef55b7453303a9a2b20590815c967d044a13da1d.tar.gz | |
Merge changes from CUPS 1.5svn-r8916.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1766 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'templates/option-conflict.tmpl')
| -rw-r--r-- | templates/option-conflict.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/option-conflict.tmpl b/templates/option-conflict.tmpl index 5086a649f..3772295a8 100644 --- a/templates/option-conflict.tmpl +++ b/templates/option-conflict.tmpl @@ -1,7 +1,7 @@ <P><B>Error:</B> The following options are conflicting:</P> <UL> -{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI> +{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI> }</UL> <P>Please change one or more of the options to resolve the conflicts.</P> |