Resovle merge conflict.

Add new generated API into src jar file.
apache · Dec 16, 2018 · 164f77a · 164f77a
1 parent 8b70afd
commit 164f77a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scala-package/.gitignore b/scala-package/.gitignore
@@ -1,10 +1,10 @@
 .flattened-pom.xml
 core/src/main/scala/org/apache/mxnet/NDArrayAPIBase.scala
 core/src/main/scala/org/apache/mxnet/NDArrayBase.scala
+core/src/main/scala/org/apache/mxnet/NDArrayRandomAPIBase.scala
 core/src/main/scala/org/apache/mxnet/javaapi/NDArrayBase.scala
 core/src/main/scala/org/apache/mxnet/SymbolAPIBase.scala
 core/src/main/scala/org/apache/mxnet/SymbolBase.scala
-core/src/main/scala/org/apache/mxnet/NDArrayRandomAPIBase.scala
 core/src/main/scala/org/apache/mxnet/SymbolRandomAPIBase.scala
 examples/scripts/infer/images/
 examples/scripts/infer/models/

diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
@@ -96,9 +96,10 @@
               <includes>
                 <include>NDArrayAPIBase.scala</include>
                 <include>NDArrayBase.scala</include>
+                <include>NDArrayRandomAPIBase.scala</include>
                 <include>javaapi/NDArrayBase.scala</include>
                 <include>SymbolAPIBase.scala</include>
-                <include>SymbolBase.scala</include>
+                <include>SymbolRandomAPIBase.scala</include>
               </includes>
               <followSymlinks>false</followSymlinks>
             </fileset>