From 5b516418ed90ca0d268a6a63948727db7fea5cea Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Thu, 2 Mar 2023 12:45:28 -0500 Subject: [PATCH] fix merge --- .../ca/cosc3p91/a2/gameobjects/ResourceBuidling.java | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java deleted file mode 100644 index c0c9fbc..0000000 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java +++ /dev/null @@ -1,11 +0,0 @@ -package ca.cosc3p91.a2.gameobjects; - -public abstract class ResourceBuidling extends Building { - - public static String resource; - - private int harvest_rate; - - public abstract void harvest(Village_Hall hall); - -}