Fix conflict with planningoptions#35

Axel35000-tech wants to merge 1 commit into10.0/bugfixesInfotelGLPI/activity:10.0/bugfixesfrom

10.0/bugfixes-fix-conflict-with-planningoptionsInfotelGLPI/activity:10.0/bugfixes-fix-conflict-with-planningoptionsCopy head branch name to clipboard