Merge changes from CUPS 1.4svn-r7770.

[thirdparty/cups.git] / cups / conflicts.c

diff --git a/cups/conflicts.c b/cups/conflicts.c
index 79dbb417413f8d869dd84b7542ad7e9cfdc9d9ae..042bfdcec6f74bc87fa0bbc3f00ea7d280f4f5c9 100644 (file)
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -87,8 +87,6 @@ ppdConflicts(ppd_file_t *ppd)         /* I - PPD to check */
   * Clear all conflicts...
   */
 
-  conflicts = 0;
-
   for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
     o->conflicted = 0;