You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2016/05/07 13:17:46 UTC
groovy git commit: GROOVY-7604: traits docs diamond problem
explanation (closes #327)
Repository: groovy
Updated Branches:
refs/heads/master 05e9f5639 -> bf0361741
GROOVY-7604: traits docs diamond problem explanation (closes #327)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/bf036174
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/bf036174
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/bf036174
Branch: refs/heads/master
Commit: bf0361741a7a406aa8e1173be3c9c830a849d4ac
Parents: 05e9f56
Author: Andre Steingress <me...@andresteingress.com>
Authored: Wed May 4 22:07:47 2016 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sat May 7 15:17:13 2016 +0200
----------------------------------------------------------------------
src/spec/doc/core-traits.adoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/bf036174/src/spec/doc/core-traits.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-traits.adoc b/src/spec/doc/core-traits.adoc
index 36232e4..d443b94 100644
--- a/src/spec/doc/core-traits.adoc
+++ b/src/spec/doc/core-traits.adoc
@@ -199,8 +199,7 @@ WARNING: While traits support public fields, it is not recommended to use them a
== Composition of behaviors
-Traits can be used to implement multiple inheritance in a controlled way, avoiding the diamond issue. For example, we
-can have the following traits:
+Traits can be used to implement multiple inheritance in a controlled way. For example, we can have the following traits:
[source,groovy]
----