LOW / Change the apparence of the information message. Ask new choices
for the user "Don't show this message again", and "Show conflicts": with
the first option the message is never show again. With the second option
the message displays the conflitcs
Merge branch '1.7.0' of ssh://git@github.com/openflexo-team/openflexo-core into 1.7.0