diff options
| author | Robin Cook | 2011-12-07 17:51:36 -0600 |
|---|---|---|
| committer | Robin Cook | 2011-12-07 17:51:36 -0600 |
| commit | 34991b7d2ef532ea5f6c3868ea0c7abd687f6929 (patch) | |
| tree | 4a6070de05eb9e8011120d3bb2a9f74d80b6f717 /java/icedtea6/CONFLICTS | |
| parent | bfebc77766a64f0cb11fb948a9c30c2aa9a3c0a9 (diff) | |
icedtea6: New Spell, OpenJDK build using autotools
Diffstat (limited to 'java/icedtea6/CONFLICTS')
| -rwxr-xr-x | java/icedtea6/CONFLICTS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS new file mode 100755 index 0000000000..0e66666302 --- /dev/null +++ b/java/icedtea6/CONFLICTS @@ -0,0 +1,6 @@ +conflicts j2sdk && +conflicts j2sdk-bin && +conflicts jre1.5-bin && +conflicts jre6-bin && +conflicts jdk1.5-bin && +conflicts jdk6-bin |