summaryrefslogtreecommitdiffstats
path: root/java/icedtea6/CONFLICTS
diff options
context:
space:
mode:
authorRobin Cook2012-06-17 18:24:02 -0500
committerRobin Cook2012-06-17 18:24:02 -0500
commit33f09b5d900bf4bd0b30acde4248a541af053035 (patch)
tree08a85e0ed3067e10eea6e5c93bd057b4810dad6c /java/icedtea6/CONFLICTS
parent516a846eec9f0999cfac28d798717b740f8ca1df (diff)
icedtea6: added icedtea7 to CONFLICTS
Diffstat (limited to 'java/icedtea6/CONFLICTS')
-rwxr-xr-xjava/icedtea6/CONFLICTS3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS
index 0e66666302..4729bad209 100755
--- a/java/icedtea6/CONFLICTS
+++ b/java/icedtea6/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk1.5-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts icedtea7