Commit dcbb2c96 authored by lr119628's avatar lr119628
Browse files

Merge remote-tracking branch 'origin/AdaNet_Luis_Rickert_ba' into AdaNet_Luis_Rickert_ba

# Conflicts:
#	pom.xml
parents 0191cb24 7abfa251
Pipeline #524530 failed with stage
in 56 seconds
......@@ -9,7 +9,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnnarch-generator</artifactId>
<version>0.4.5-SNAPSHOT</version>
<version>0.4.8-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
......@@ -17,9 +17,9 @@
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>0.4.5-SNAPSHOT</CNNArch.version>
<CNNArch.version>0.4.7-SNAPSHOT</CNNArch.version>
<CNNTrain.version>0.4.5-SNAPSHOT</CNNTrain.version>
<embedded-montiarc-math-generator>0.4.4-SNAPSHOT</embedded-montiarc-math-generator>
<embedded-montiarc-math-generator>0.4.7</embedded-montiarc-math-generator>
<!-- .. Libraries .................................................. -->
<guava.version>25.1-jre</guava.version>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment