[Numpy-svn] r5708 - trunk/numpy/ma

[numpy-svn at scipy.org]

Author: pierregm
Date: 2008-08-26 17:34:13 -0500 (Tue, 26 Aug 2008)
New Revision: 5708

Modified:
   trunk/numpy/ma/core.py
Log:
* fixing botched previous commit

Modified: trunk/numpy/ma/core.py
===================================================================
--- trunk/numpy/ma/core.py	2008-08-26 22:19:44 UTC (rev 5707)
+++ trunk/numpy/ma/core.py	2008-08-26 22:34:13 UTC (rev 5708)
@@ -3865,16 +3865,9 @@
     if len(fb.shape) == 0:
         fb.shape = (1,)
     return np.inner(fa, fb).view(MaskedArray)
-<<<<<<< .mine
 inner.__doc__ = doc_note(np.inner.__doc__, 
                          "Masked values are replaced by 0.")
-=======
-
->>>>>>> .r5706
 innerproduct = inner
-if np.inner.__doc__ is not None :
-    notes = doc_note("Masked values are replaced by 0.")
-    inner.__doc__ = np.inner.__doc__ + notes
 
 def outer(a, b):
     "maskedarray version of the numpy function."
@@ -3889,16 +3882,9 @@
     mb = getmaskarray(b)
     m = make_mask(1-np.outer(1-ma, 1-mb), copy=0)
     return masked_array(d, mask=m)
-<<<<<<< .mine
 outer.__doc__ = doc_note(np.outer.__doc__,
                          "Masked values are replaced by 0.")
-=======
-
->>>>>>> .r5706
 outerproduct = outer
-if np.outer.__doc__ is not None :
-    notes = doc_note("Masked values are replaced by 0.")
-    outer.__doc__ = np.outer.__doc__ + notes
 
 def allequal (a, b, fill_value=True):
     """Return True if all entries of a and b are equal, using