Import CUPS v1.7.1

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

diff --git a/cups/conflicts.c b/cups/conflicts.c
index ae048d135e8ed44b296793eb7a2c7045cf0b9fdf..2ec8b7eb624b4634c7da76d8d8e28be0a2e31c35 100644 (file)
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: conflicts.c 3933 2012-10-01 03:01:10Z msweet $"
  *
  *   Option marking routines for CUPS.
  *
@@ -1210,5 +1210,5 @@ ppd_test_constraints(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: conflicts.c 3933 2012-10-01 03:01:10Z msweet $".
  */