Merge branch 'master' of https://git.ysjcs.net:8888/a-j.towse/classassessment2

src/App.java

@@ -5,8 +5,11 @@ public class App {
 
         Shape shape2 = new Square(3);
         shape2.draw();
+<<<<<<< HEAD
 
         Shape shape3 = new Rectangle(5,7);
         shape3.draw();
+=======
+>>>>>>> 6c07dbfb68ad5b5ceab794cbb90d1b5c17473575
     }
 }

src/Rectangle.java

@@ -22,6 +22,7 @@ public class Rectangle extends Shape{
       float circ = (width*2) + (height*2);
       return circ;
     }
+<<<<<<< HEAD
 
     @Override
     public void draw(){
@@ -42,4 +43,11 @@ public class Rectangle extends Shape{
         }
         System.out.println("");
     }
+=======
+    @Override
+    public void draw(){
+  
+    }
+
+>>>>>>> 6c07dbfb68ad5b5ceab794cbb90d1b5c17473575
 }

src/Square.java

@@ -34,7 +34,10 @@ public class Square extends Shape{
         for (int loop4=0; loop4<size; loop4++){
             System.out.print("--");
         }
+<<<<<<< HEAD
         System.out.println("");
+=======
+>>>>>>> 6c07dbfb68ad5b5ceab794cbb90d1b5c17473575
     }
     
 }