Skip to content
Snippets Groups Projects
Commit bc75250b authored by MANSOUR Chadi's avatar MANSOUR Chadi
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/shape/Rectangle.java
parents 74a5c5dc f9005d7a
Branches
No related tags found
No related merge requests found
......@@ -6,7 +6,6 @@ import javafx.scene.paint.Color;
public class Circle implements Shape {
private double radius, x, y;
public Color fillColor;
private boolean isFinished;
public Circle(double x, double y, double radius) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment