diff options
Diffstat (limited to 'java/icedtea6/CONFLICTS')
-rwxr-xr-x | java/icedtea6/CONFLICTS | 3 |
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 |