z
Merge branch 'master' of https://github.com/lsr90518/ValdacBeta

Conflicts:
	.idea/workspace.xml
?
?
delete
Merge branch 'liu'

Conflicts:
	.idea/workspace.xml
	target/ValdacBeta.war
…
no message
Merge remote-tracking branch 'origin/liu'

Conflicts:
	.idea/workspace.xml
no message
no message
Merge remote-tracking branch 'origin/master' into liu

Conflicts:
	.idea/workspace.xml
Merge branch 'master' into liu

Conflicts:
	.idea/workspace.xml
no message