Merge changes from CUPS 1.5svn-r8916.

[thirdparty/cups.git] / templates / option-conflict.tmpl

diff --git a/templates/option-conflict.tmpl b/templates/option-conflict.tmpl
index 5086a649f2586deb408c418dc870c1c32ef2326d..3772295a8305afa78569a7d1aa32adc7601a43e5 100644 (file)
--- 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>