winfreds/TryConflict2 — pull request #1 by winfreds (2014-08-27 12:42:48+00:00)
Title: test

pls check it. tyvmchy