neilkumar101
diff --git a/‎plotly/tools.py
Copy file name to clipboardExpand all lines: plotly/tools.py
+3-2Lines changed: 3 additions & 2 deletions b/‎plotly/tools.py
Copy file name to clipboardExpand all lines: plotly/tools.py
+3-2Lines changed: 3 additions & 2 deletions
@@ -1762,7 +1762,6 @@ def create_streamline(x, y, u, v,
                              y=streamline_y + arrow_y,
                              mode='lines', **kwargs)
 
-<<<<<<< HEAD
         data = [streamline]
         layout = graph_objs.Layout(hovermode='closest')
 
@@ -2290,7 +2289,9 @@ def create_dendrogram(X, orientation="bottom", labels=None,
         colorscale: Optional colorscale for dendgrogram tree clusters
         """
 
-        #TODO: add validations of input
+        s = X.shape
+        if len(s) != 2:
+            exceptions.PlotlyError("X should be 2-dimensional array.")
 
         dendrogram = _Dendrogram(X, orientation, labels, colorscale)
         return dendrogram