Commit 118e581a authored by Jean Meurice's avatar Jean Meurice
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/cnnarch2x into sim-dev
parents 730785aa dca97999
Pipeline #495344 passed with stage
in 1 minute and 7 seconds
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>25.1-jre</guava.version> <guava.version>25.1-jre</guava.version>
<junit.version>4.13.1</junit.version> <junit.version>4.13.1</junit.version>
<logback.version>1.1.2</logback.version> <logback.version>1.2.0</logback.version>
<jscience.version>4.3.1</jscience.version> <jscience.version>4.3.1</jscience.version>
<!-- .. Plugins ....................................................... --> <!-- .. Plugins ....................................................... -->
......
Supports Markdown
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