Popup

[Meowvw]

fixed submit button on matchEndPopup delete unnecessary lines

[tyrcho]

@Meowvw can you please fix the merge ? Here you commited code which does not compile ...

[Meowvw]

sorry about that，I think there re several conflicts between my code and master's. is there a way of ignoring these conflicts？I think only the change of MatchEndPop is enough for fixing the submitButton problem

Thank you Suchen Wang ( Suzy )

在 2015年3月26日，16:48，Michel Daviot notifications@github.com 写道：

@Meowvw can you please fix the merge ? Here you commited code which does not compile ...

— Reply to this email directly or view it on GitHub.

[tyrcho]

Well you can't just ignore conflicts :) You need to decide which part of the file is to be kept ...

I use git in command line, and when I get a conflict on a merge I solve it with 'git mergetool -y', usually with kdiff3 as the merge tool.