diff --git a/notebooks/core/Merge.ipynb b/notebooks/core/Merge.ipynb index 9b7984c..00c6625 100644 --- a/notebooks/core/Merge.ipynb +++ b/notebooks/core/Merge.ipynb @@ -720,8 +720,9 @@ } ], "metadata": { + "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [default]", "language": "python", "name": "python3" }, diff --git a/src/layers/core/Merge.js b/src/layers/core/Merge.js index 9bb930b..6eb6aff 100644 --- a/src/layers/core/Merge.js +++ b/src/layers/core/Merge.js @@ -67,7 +67,7 @@ export default class Merge extends Layer { if (this.dotAxes < 0) { this.dotAxes = [shapes[0].length + this.dotAxes, shapes[1].length + this.dotAxes] } else { - this.dotAxes = [this.dotAxes - 1, this.dotAxes - 1] + this.dotAxes = [this.dotAxes, this.dotAxes] } } if (shapes[0][this.dotAxes[0]] !== shapes[1][this.dotAxes[1]]) {