fix error on merging theme.html.twig
fix error on merging theme.html.twig


Former-commit-id: a7a3b3d2e2649c014de6635c65bb39e0c06d6c65
Jedisjeux/Jedisjeux,Jedisjeux/Jedisjeux,loic425/Jedisjeux,loic425/Jedisjeux,loic425/Jedisjeux,Jedisjeux/Jedisjeux,loic425/Jedisjeux,Jedisjeux/Jedisjeux,loic425/Jedisjeux