1

NamPV8

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author:    pvnambsw <106292717+pvnambsw@users.noreply.github.com>
#
# interactive rebase in progress; onto 48e4595
# Last commands done (6 commands done):
#    pick 1f48b13 Update do Nam lam tren nhanh main
#    pick afaec8e NamPV8
# Next commands to do (81 remaining commands):
#    pick 78b8a8f NamPV8
#    pick 74338ef Hai da hoi sinh =))
# You are currently rebasing branch 'NamNV60' on '48e4595'.
#
# Changes to be committed:
#	modified:   src/main/java/com/java04/wibucian/controllers/admin/IngredientController.java
#	modified:   src/main/java/com/java04/wibucian/models/Ingredient.java
#	modified:   src/main/java/com/java04/wibucian/services/IngredientService.java
#	new file:   src/main/webapp/WEB-INF/views/admin/ingredient/index.jsp
#