From 748ceaf0bf30fe1587b3708d9c7fd5ab14bfe35a Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mtg@gnu.org>
Date: Wed, 28 Dec 2016 03:07:16 -0500
Subject: [PATCH] Fix silly mix{o=e}r typo in Trait

* lib/Trait.js (_validateMixin): Change docblock and error message to
    resolve typo.
---
 lib/Trait.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Trait.js b/lib/Trait.js
index 57f338e..c2d4ac3 100644
--- a/lib/Trait.js
+++ b/lib/Trait.js
@@ -251,7 +251,7 @@ Trait.extend = function( /* ... */ )
  * into something of type S; a `TypeError` will be thrown if this contract
  * is violated.
  *
- * @param  {Class}  base  mixor (target of mixin)
+ * @param  {Class}  base  mixer (target of mixin)
  * @param  {Trait}  T     mixee (trait being mixed in)
  *
  * @return  {undefined}
@@ -272,7 +272,7 @@ function _validateMixin( base, T )
     {
         throw TypeError(
             "Cannot mix trait " + T.toString() + " into " + base.toString() +
-                "; mixor must be of type " + T.__extbase.toString()
+                "; mixer must be of type " + T.__extbase.toString()
         );
     }
 }