no changes

binodcoder · binodcoder · commit 28fbdd99b260 · 2024-05-05T12:55:59.000+01:00
diff --git a/src/Main.java b/src/Main.java
@@ -1,18 +1,39 @@
 class Shape {
     String colour;
     double area;
+
     Shape(String colour) {
+
         this.colour = colour;
     }
+
+    Shape(String colour, double area) {
+        this.colour = colour;
+        this.area = area;
+    }
+<<<<<<< HEAD
     Shape(String colour, double area) {
         this.colour = colour;
         this.area = area;
     }
+=======
+
+    Shape(double area){
+        this.area=area;
+    }
+
+>>>>>>> 6a69c2f26198bd230a5a8aa01188f299f6834402
     Shape(Shape s1) {
         this.colour = s1.colour;
         this.area = s1.area;
     }
+<<<<<<< HEAD
     void findArea() {
+=======
+
+    void findArea() {
+
+>>>>>>> 6a69c2f26198bd230a5a8aa01188f299f6834402
     }
 }
 
