trm fix conflict

Change-Id: Idcb28ef5a4c639191fb86ed5aee23892c5d7a118
diff --git a/src/main/java/api/ApiMain.java b/src/main/java/api/ApiMain.java
index b0650ef..9ec383a 100644
--- a/src/main/java/api/ApiMain.java
+++ b/src/main/java/api/ApiMain.java
@@ -3,6 +3,5 @@
     public static void main(String args[])
     {
         System.out.println("Hello World"); 
-        System.out.println("Hello World"); 
     }
 }
\ No newline at end of file