branch merge

thoo · thoo · commit 626c0145b4e9 · 2018-10-16T17:36:54.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6778,8 +6778,13 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
             return tops, bins, cbook.silent_list('Lists of Patches', patches)
 
     @_preprocess_data(replace_names=["x", "y", "weights"], label_namer=None)
+<<<<<<< HEAD
     def hist2d(self, x, y, bins=10, range=None, density=None,
                weights=None, cmin=None, cmax=None, normed=None, **kwargs):
+=======
+    def hist2d(self, x, y, bins=10, range=None, density=None,  normed=None, weights=None,
+               cmin=None, cmax=None, **kwargs):
+>>>>>>> ce6ed74e991532310f6b9865f1f4e2eae4da639b
         """
         Make a 2D histogram plot.
 
@@ -6813,18 +6818,30 @@ def hist2d(self, x, y, bins=10, range=None, density=None,
              considered outliers and not tallied in the histogram.
 
         density : boolean, optional
+<<<<<<< HEAD
              If False, the default, returns the number of samples in each bin.
+=======
+             If False, the default, returns the number of samples in each bin. 
+>>>>>>> ce6ed74e991532310f6b9865f1f4e2eae4da639b
              If True, returns the probability *density* function at the bin,
              ``bin_count / sample_count / bin_area``.
 
              Default is ``None`` for both *normed* and *density*. If either is
              set, then that value will be used. If neither are set, then the
              args will be treated as ``False``.
+<<<<<<< HEAD
              If both *density* and *normed* are set an error is raised.
 
         normed : bool, optional, default: None
              Deprecated; use the density keyword argument instead.
 
+=======
+             If both *density* and *normed* are set an error is raised. 
+        
+        normed : bool, optional, default: None
+             Deprecated; use the density keyword argument instead.  
+        
+>>>>>>> ce6ed74e991532310f6b9865f1f4e2eae4da639b
 
         weights : array_like, shape (n, ), optional, default: None
              An array of values w_i weighing each sample (x_i, y_i).
@@ -6883,12 +6900,22 @@ def hist2d(self, x, y, bins=10, range=None, density=None,
         """
         if density is not None and normed is not None:
             raise ValueError("kwargs 'density' and 'normed' cannot be used "
+<<<<<<< HEAD
                              "simultaneously. Please only use 'density', "
                              "since 'normed' is deprecated.")
         if normed is not None:
             cbook.warn_deprecated("2.1", name="'normed'", obj_type="kwarg",
                                   alternative="'density'", removal="3.1")
 
+=======
+                             "simultaneously. "
+                             "Please only use 'density', since 'normed'"
+                             "is deprecated.")
+        if normed is not None:
+            cbook.warn_deprecated("2.1", name="'normed'", obj_type="kwarg",
+                                  alternative="'density'", removal="3.1")
+                                  
+>>>>>>> ce6ed74e991532310f6b9865f1f4e2eae4da639b
         normed = bool(density) or bool(normed)
         h, xedges, yedges = np.histogram2d(x, y, bins=bins, range=range,
                                            normed=normed, weights=weights)
