diff options
| author | Treeve Jelbert | 2015-12-26 13:31:03 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2015-12-26 13:31:03 +0100 |
| commit | d9cdc9e80bad57c1b5ea76bfa94a87895b6d1a37 (patch) | |
| tree | 399aaf444a3b957be46a57d8c0d0ced9360ea885 /ruby-raa | |
| parent | 6c545ae62f9bf8938628b60b13318bf102ddb0e1 (diff) | |
ruby-2.0 - extra conflict
Diffstat (limited to 'ruby-raa')
| -rwxr-xr-x | ruby-raa/ruby-2.0/CONFLICTS | 1 | ||||
| -rw-r--r-- | ruby-raa/ruby-2.0/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-2.0/CONFLICTS b/ruby-raa/ruby-2.0/CONFLICTS index fc1a4bc603..e59e61647e 100755 --- a/ruby-raa/ruby-2.0/CONFLICTS +++ b/ruby-raa/ruby-2.0/CONFLICTS @@ -3,4 +3,5 @@ conflicts ruby-1.8 conflicts ruby-1.9 conflicts ruby-2.1 conflicts ruby-2.2 +conflicts ruby-2.3 conflicts ruby-enterprise-edition diff --git a/ruby-raa/ruby-2.0/HISTORY b/ruby-raa/ruby-2.0/HISTORY index 3412e7b82d..5abcd2233c 100644 --- a/ruby-raa/ruby-2.0/HISTORY +++ b/ruby-raa/ruby-2.0/HISTORY @@ -1,3 +1,6 @@ +2015-12-26 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add ruby-2.3 + 2015-01-03 Treeve Jelbert <treeve@sourcemage.org> * CONFLICTS: add ruby-2.2 |