[BAEL-9696] - Fixed conflicts

2018-10-28 15:58:53 +05:30
parent 2eefb41ecd 013e09c6d5
commit 571c21b555
257 changed files with 2720 additions and 3338 deletions
@@ -23,7 +23,7 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <!-- The main class to start by executing java -jar -->
-        <start-class>com.mycorp.starter.HelloWorldApplication</start-class>
+        <start-class>com.baeldung.h2db.demo.server.SpringBootApp</start-class>
    </properties>

    <dependencies>