package com.angles.angles;

import android.app.Activity;
import android.os.Bundle;

import com.angles.angles.AnglesController;

@SuppressWarnings("unused")
public class MainActivity extends Activity {
	//hello

	private AnglesController  itsMainController = new AnglesController(this);
    @Override
    protected void onCreate(Bundle savedInstanceState) {
    	 super.onCreate(savedInstanceState);
        	 itsMainController.homeEvent();  
      
     
    }

    
   public void hello(){
	   
   }
   
}

@@ -479,21 +479,16 @@
 %0D%0A%0D%0A    
-%0D%0A   
 public v
@@ -495,24 +495,45 @@
 oid 
-hello()%7B%0D%0A%09   
+goodbye()%0D%0A    %7B%0D%0A    %09int j = 45;
 %0D%0A
+ 
    %7D

Test Merge Conflict