Merge remote-tracking branch 'origin/master' into code_bank

# Conflicts: # .idea/workspace.xml
2021-04-23 16:06:21 -04:00
parent 5510d7f579 d99b4dbdb3
commit 75dad45f99
4 changed files with 14 additions and 13 deletions
@@ -15,6 +15,7 @@
      <module name="cwiki-us-demo-tutorials.spring-batch.main" target="11" />
      <module name="cwiki-us-demo-tutorials.spring-batch.test" target="11" />
      <module name="lang-tutorial" target="1.5" />
+      <module name="parent-modules" target="11" />
    </bytecodeTargetLevel>
  </component>
 </project>