From: satomichan <git.20200328@...>
Date: Sun, 27 Dec 2020 08:35:07 +0000 (+0900)
Subject: Merge branch 'master' of ssh://e5.valueserver.jp/virtual/satomichan/gitrepo/nucalgen
X-Git-Tag: JAR_2020-12-27_1930_BUILD^2
X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=commitdiff_plain;h=de7fe2b54e91f0ec7c216956e8037fb0bac45643

Merge branch 'master' of ssh://e5.valueserver.jp/virtual/satomichan/gitrepo/nucalgen

# Conflicts:
#	src/main/java/jp/satomichan/nucalgen/MoeStdFoodCompTable.java
#	src/main/java/jp/satomichan/nucalgen/Nucalgen.java
---

de7fe2b54e91f0ec7c216956e8037fb0bac45643