fixed

ChangeLog

@@ -20,12 +20,8 @@
 * Backpedaling: a modification in version 5.0.3 "Force reload of settings file when command box is starting." did not correctly fix the problem,
 * the load method must be called in endInit method.
 * Set default vertical alignement to center for SWTAsyncExecCanvas.
-<<<<<<< HEAD
 * Added new icon "showButton"
-
-=======
 * Add a boolean displayConfigurationErrorMessage in ControllerPluginPeer allowing to not display configuration errors in one plugin.
->>>>>>> d1c15a189fe2d62a5eb8cb3feeea0721175dcc64
 
 5.2.0 16/12/2024
 -----