adjust the pom to make project can be compile

This commit is contained in:
YuCheng Hu
2021-04-15 12:15:45 -04:00
parent 43c81ad3d4
commit a228fa25f3
9 changed files with 47 additions and 112 deletions
@@ -2,37 +2,15 @@ package com.ossez.lang.tutorial.overview;
/**
* Java Tutorial
*
<<<<<<< HEAD
*
* This is my first java program. This will print 'Hello World' as the output This is an example of multi-line comments
*
=======
<<<<<<< HEAD
=======
* This is my first java program. This will print 'Hello World' as the output This is an example of multi-line comments
*
>>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
>>>>>>> RB
*
* @author YuCheng
*
*/
public class HelloWorld {
public static void main(String[] args) {
<<<<<<< HEAD
=======
<<<<<<< HEAD
System.out.println("Hello World");
}
}
=======
>>>>>>> RB
// This is an example of single line comment
/* This is also an example of single line comment. */
System.out.println("Hello World");
}
}
<<<<<<< HEAD
=======
>>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
>>>>>>> RB