<<<<<<< HEAD

public class Clase {
	private int atributo1, atributo2;	
	
	public Clase(int atributo1, int atributo2) {
		this.atributo1=atributo1;
		this.atributo2=atributo2;
	}
	
	public int suma(){
		return atributo1+atributo2;
	}
	public int resta(){
		return atributo1-atributo2;
	}
	public int multiplicacion(){
		return atributo1*atributo2;
	}

}
=======

public class Clase {
	private int atributo1, atributo2;	
	
	public Clase(int atributo1, int atributo2) {
		this.atributo1=atributo1;
		this.atributo2=atributo2;
	}
	
	public int suma(){
		return atributo1+atributo2;
	}
	public int resta(){
		return atributo1-atributo2;
	}
	public int multiplicacion(){
		return atributo1*atributo2;
	}

}
>>>>>>> Topic0


public class Clase {
	private int atributo1, atributo2;	
	
	public Clase(int atributo1, int atributo2) {
		this.atributo1=atributo1;
		this.atributo2=atributo2;
	}
	
	public int suma(){
		return atributo1+atributo2;
	}
	public int resta(){
		return atributo1-atributo2;
	}
	public int multiplicacion(){
		return atributo1*atributo2;
	}

}

Update Clase.java