-
Kryzl Deanne Pascual authored
Conflicts: RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/AddEditProfile.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Admin.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Cart.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Customer.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/EditBill.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/EditMenu.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Kitchen.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Login.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/MainActivity.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$id.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$layout.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$menu.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$string.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$style.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Register.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/SelectAccount.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Settings.class RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/ViewProfile.class RestaurantOrderingSystem/gen/com/cs123grpE/restaurantorderingsystem/R.java RestaurantOrderingSystem/res/layout/activity_add_edit_profile.xml
df3c2863
