Merge pull request #598 from iks3/feature-element-a14

author iks <iks3@users.noreply.github.com>

Thu, 25 Mar 2021 14:40:20 +0000 (23:40 +0900)

committer GitHub <noreply@github.com>

Thu, 25 Mar 2021 14:40:20 +0000 (23:40 +0900)
author iks <iks3@users.noreply.github.com>
Thu, 25 Mar 2021 14:40:20 +0000 (23:40 +0900)
committer GitHub <noreply@github.com>
Thu, 25 Mar 2021 14:40:20 +0000 (23:40 +0900)
diff --cc src/mind/mind-elementalist.cpp
Simple merge
diff --cc src/player/player-status-flags.cpp
Simple merge
author	iks <iks3@users.noreply.github.com>
	Thu, 25 Mar 2021 14:40:20 +0000 (23:40 +0900)
committer	GitHub <noreply@github.com>
	Thu, 25 Mar 2021 14:40:20 +0000 (23:40 +0900)
		1	2
src/mind/mind-elementalist.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/player/player-status-flags.cpp	patch \|	diff1 \|	diff2 \|	blob \| history