remove git conflict string in properties file
Signed-off-by: palary18 <palary18@free.fr>
Merge branch 'master' of https://github.com/palary18/ardublock into try-palary