summaryrefslogtreecommitdiffstats
path: root/ruby-raa
diff options
context:
space:
mode:
authorPavel Vinogradov2018-12-25 16:53:23 -0500
committerPavel Vinogradov2018-12-25 16:53:23 -0500
commitf932a4caca0575f018e6f5b67d2a2a6231b5173f (patch)
tree476b74c7a9adc4da4765cc24c76e19a3aabc44c0 /ruby-raa
parent696fa53d6438c66fe0c444a9c426050c0890c431 (diff)
ruby-raa/ruby-2.5: conflicts with ruby-2.6
Diffstat (limited to 'ruby-raa')
-rwxr-xr-xruby-raa/ruby-2.5/CONFLICTS1
-rw-r--r--ruby-raa/ruby-2.5/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-2.5/CONFLICTS b/ruby-raa/ruby-2.5/CONFLICTS
index eb50d3dcfb..6012c76682 100755
--- a/ruby-raa/ruby-2.5/CONFLICTS
+++ b/ruby-raa/ruby-2.5/CONFLICTS
@@ -6,6 +6,7 @@ conflicts ruby-2.1
conflicts ruby-2.2
conflicts ruby-2.3
conflicts ruby-2.4
+conflicts ruby-2.6
conflicts ruby-enterprise-edition
conflicts rubygems
conflicts rake
diff --git a/ruby-raa/ruby-2.5/HISTORY b/ruby-raa/ruby-2.5/HISTORY
index b964e60ba8..f5d169e238 100644
--- a/ruby-raa/ruby-2.5/HISTORY
+++ b/ruby-raa/ruby-2.5/HISTORY
@@ -1,3 +1,6 @@
+2018-12-25 Pavel Vinogradov <public@sourcemage.org>
+ * CONFLICTS: added ruby-2.6
+
2018-10-19 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: fix url, ftp=>https