Merge commit '7ef4ae75153b6439150d175040345cfef6c742d3'

author MORIOKA Tomohiko <tomo.git@chise.org>

Sun, 20 Jun 2021 04:50:06 +0000 (13:50 +0900)

committer MORIOKA Tomohiko <tomo.git@chise.org>

Sun, 20 Jun 2021 04:50:06 +0000 (13:50 +0900)
author MORIOKA Tomohiko <tomo.git@chise.org>
Sun, 20 Jun 2021 04:50:06 +0000 (13:50 +0900)
committer MORIOKA Tomohiko <tomo.git@chise.org>
Sun, 20 Jun 2021 04:50:06 +0000 (13:50 +0900)
diff --cc IDS-UCS-Basic.txt
Simple merge
diff --cc IDS-UCS-Ext-A.txt
Simple merge
author	MORIOKA Tomohiko <tomo.git@chise.org>
	Sun, 20 Jun 2021 04:50:06 +0000 (13:50 +0900)
committer	MORIOKA Tomohiko <tomo.git@chise.org>
	Sun, 20 Jun 2021 04:50:06 +0000 (13:50 +0900)
		1	2
IDS-UCS-Basic.txt	patch \|	diff1 \|	diff2 \|	blob \| history
IDS-UCS-Ext-A.txt	patch \|	diff1 \|	diff2 \|	blob \| history