Fix merge conflict

Author: lukelbd

docs/2dplots.ipynb

@@ -325,7 +325,7 @@
     "data[np.tril_indices(data.shape[0], -1)] = np.nan # fill half with empty boxes\n",
     "data = pd.DataFrame(data, columns=list('abcdefghij'), index=list('abcdefghij'))\n",
     "m = ax.heatmap(data, cmap='ColdHot', vmin=-1, vmax=1, N=100,\n",
-    "               lw=0.7, edgecolor='k', labels=True, labels_kw={'weight':'bold'},\n",
+    "               lw=0.5, edgecolor='k', labels=True, labels_kw={'weight':'bold'},\n",
     "               clip_on=False) # turn off clipping so box edges on spines are not cut in half\n",
     "ax.format(suptitle='Heatmap demo', title='Pseudo covariance matrix', alpha=0, linewidth=0,\n",
     "          xloc='top', yloc='right', yreverse=True, ticklabelweight='bold')"