no message
Merge branch 'liu'

Conflicts:
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/dao/KikiMapper.class
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/service/KikiService.class
	target/ValdacBeta/WEB-INF/pages/addkiki.jsp
	target/classes/com/ValdacBeta/dao/KikiMapper.class
	target/classes/com/ValdacBeta/service/KikiService.class
kiki image
kiki image
Merge commit '2e2e4a21141bef821e0a1d7a6e6ee4ac5fbfa374' into liu

Conflicts:
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
機器画像、更新履歴
Master leave
Master begin
no message
Merge branch 'liu'

Conflicts:
	.idea/workspace.xml
	ValdacBeta.iml
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/dao/KikiMapper.class
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/service/KikiService.class
	target/ValdacBeta/WEB-INF/pages/addkiki.jsp
	target/classes/com/ValdacBeta/dao/KikiMapper.class
	target/classes/com/ValdacBeta/service/KikiService.class
ver0.8
Location テーブルから場所を抽出する
Location箇所抽出
いらないファイルです