• Kryzl Deanne Pascual's avatar
    Merge remote-tracking branch 'origin/master' · df3c2863
    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
Name
Last commit
Last update
..
AddEditProfile.class Loading commit data...
Admin.class Loading commit data...
BuildConfig.class Loading commit data...
Cart.class Loading commit data...
Customer$1.class Loading commit data...
Customer$2.class Loading commit data...
Customer$3.class Loading commit data...
Customer$4.class Loading commit data...
Customer.class Loading commit data...
EditBill.class Loading commit data...
EditMenu$1.class Loading commit data...
EditMenu$2.class Loading commit data...
EditMenu$3.class Loading commit data...
EditMenu$4.class Loading commit data...
EditMenu.class Loading commit data...
ExpandableAdapter.class Loading commit data...
Kitchen.class Loading commit data...
Login$1.class Loading commit data...
Login$2.class Loading commit data...
Login.class Loading commit data...
MainActivity.class Loading commit data...
MenuListItem.class Loading commit data...
R$attr.class Loading commit data...
R$dimen.class Loading commit data...
R$drawable.class Loading commit data...
R$id.class Loading commit data...
R$layout.class Loading commit data...
R$menu.class Loading commit data...
R$string.class Loading commit data...
R$style.class Loading commit data...
R.class Loading commit data...
Register$1.class Loading commit data...
Register.class Loading commit data...
SelectAccount.class Loading commit data...
Settings.class Loading commit data...
User.class Loading commit data...
ViewProfile.class Loading commit data...