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