Projects >> Arrows-and-Circles >>627d7d31dcb0fc3b79aeb9e5e67de3992f48293b

Chunk
Conflicting content 
		return _center;
	}

<<<<<<< HEAD

    public void setOffset(double x, double y){
        _offset.setLocation(x, y);
    }

    public Point getOffset(){
        return _offset;
    }

	public void setRadius(double r){
		_radius = r;
=======
	public void setRadius(double radius){
		_radius = radius;
>>>>>>> c5bcb0eeb5e445a09c787d9c86d0fa39db5ca685
	}
	
	public double getRadius() {
Solution content 
		return _center;
	}



    public void setOffset(double x, double y){
        _offset.setLocation(x, y);
    }

    public Point getOffset(){
        return _offset;
    }

	public void setRadius(double r){
		_radius = r;

    }
	
	public double getRadius() {
File
Node.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method signature
Variable