Commit 0d1d9b9399bc07cbdf975adb2919343c225d223c

Thomas de Grivel 2015-07-23T19:39:37

Check if properties are in conflict before warning.