Final Commit ammendments

src/Rectangle.java

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

src/unitTest.java

@@ -104,7 +104,7 @@ public class unitTest {
   @Test
   public void testRectangleHeight() {  
     // test setSize()
-    Shape testShape = new Rectangle(78);
+    Shape testShape = new Rectangle(7,8);
     testShape.setHeight(3);
     assertEquals(3, testShape.getHeight()); 
   }