nitta-lab-2023:master
nitta-lab-2023:ShopRest
# Conflicts: # src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java