Test modif

Fichier index.php commentaire ajouté
Merge branch 'symfony' into graphic
Création Branche
cache vider pour bon Fonctionnement
Test
suppression fichier pour création branche
Modification page 'Home'
Merge

Resolution des problèmes
Resolution problème Twig:

	Fermetur d'une balise non fermée l.36 'home.html.twig'
Modification Boostrap:
	- page home,404,about finie
	- select implementer sur la page home
Fusion des branch pour supprimer gaphic

Conflicts:
	index.php
Page faite en bootstrap
deux page en responsive
Merge remote-tracking branch 'origin/boot' into boot
Correction problème merge + intégration bootstrap

Conflicts corrigé:
	2618f3a0c370ba120727295c6c631bde20ab6dd99e.php
	app/cache/dev/twig/14/21/7d2f311058d45ed4e4352a5765edb86dc2ba3cb1072c88fb32392baa156f.php
	wig/18/31/073db38d3eb19d0c41210ff7bff8519f13c7721a462c9f7d618bf6ecba51.php
	app/cache/dev/twig/1b/8e/d8010dbf0c260d04cad3790c8e3ab56570bde359a37bebeab6fd47bf2d5a.php
	p/cache/dev/twig/1c/bd/dd1d03e95b341e63bd9bb5de090bfaf4a57e1523f96f9a14cd5a53a857f5.php
	app/cache/dev/twig/1d/86/a2de9a9198307bf322b9ab235ea5fd4fbce013d3dc97084ba5b8345e85d3.php
	app/cache/dev/twig/1f/08/504f66853ac4e721c339f49eb31c69a2c776c69c0a753bf11e7eed6ce818.php
	app/cache/dev/twig/1f/ba/40bd5c03ab88a52dfbf33ceab333c4602c162de0439b11fb60c573664e9a.php
	app/cache/dev/twig/23/5c/5dc48d11ae67df50a0d78b609510ef1a58993cf334029a7fb89a0b7d9e92.php
	app/cache/dev/twig/27/bc/ec6d6df08ec21230995065af5c5fadb7afed23e83047ef48ba283f853ff2.php
	app/cache/dev/twig/29/77/96b40edf4fb722cee522da5a015c49602869a7717fb7d1054b9aea1e3d53.php
	app/cache/dev/twig/30/81/39fae4b2ef9ec7b2ce61540d48ee2008780c4a5d7230d22188ca5f746e32.php
	app/cache/dev/twig/35/b7/85f6dfc78c5a8b4c89b5e722581f3b9fee979122b86a165134398d4f3535.php
	app/cache/dev/twig/36/d9/09d7dece84ce1d964e29acab001886073321df4f0e68883984f61175de01.php
	app/cache/dev/twig/38/91/a99552fa13f14cacc7dcf494b49cb59a883561a4987a767ed85ce6a9e802.php
	app/cache/dev/twig/38/98/429a88ee4da28d9f5f2a1276b48d5545f770f6c8733a35d53a7f7265c500.php
	app/cache/dev/twig/39/d3/c76e23f81cbc760c63f2280fde78c58ad4e1adec5cbce7aee04f6598a613.php
	app/cache/dev/twig/3a/0f/f54ad858bc1210fdc666c6e23f23d52f047ae8d31501e5599fbf799a52fe.php
	app/cache/dev/twig/3d/03/a28150b9ed6fe3edb44d4edc4d4b6aca9a3edd3592e02b091972319cacbe.php
	app/cache/dev/twig/3d/de/24968611989bb32bc37fffdc0a7987d65f36450a5288774135f6cc1223be.php
	app/cache/dev/twig/3e/c1/f7bd4785b30881d225133ac343286865f603c8ae19b3f1fbdff0278123a8.php
	app/cache/dev/twig/40/79/8f70893d378d50ce0a53f57b592698512ad4d778c89f04692bd24158e329.php
	app/cache/dev/twig/47/fa/363f0f51a70b1cb53ad6306fe5880a886f6d43177abe6d1c9b0f5de9baaa.php
	app/cache/dev/twig/4c/e8/8106fde92287dfb2290719abecfdf78178740ff84b6d20841ccaec9898b5.php
	app/cache/dev/twig/4d/c4/281b89cdd83bd12e59a2b8802abd6cc9f7fcb81d68e4e3c301a1091cfdcd.php
	app/cache/dev/twig/4e/1e/c316ad9df177d37d4f830e1f4602ac2326ae0c851a2cd81374240b83e5c0.php
	app/cache/dev/twig/50/20/9c4cbd89d69f17422f43987cbe80cda1f4858399c7d5309d80b2e4adecee.php
	app/cache/dev/twig/55/5e/bbfc9811c57af5c4b378d11ba3ebcde3c1700a51b1c145658ed59ea9f78b.php
	app/cache/dev/twig/57/05/1bf40d16bf5672c665be3fef002251aacdcd66d8aed8c8c0a5a26c6efdb0.php
	app/cache/dev/twig/57/14/46dfbde4f3667f9fea85ee678728cb630b2283ad5c7a6cb515e678bd5e1e.php
	app/cache/dev/twig/57/9d/8eaea89f5d563b6c1ed6fd1efc3f99b58e4e6c8670d702fd98295e1a3794.php
	app/cache/dev/twig/57/ef/7ba89ffc6fed941abf430cac5bbc02d698eba68e637f820e1a2e4f63fd8e.php
	app/cache/dev/twig/58/1e/f7e43512a4cf8494f12b422b1eae2e5efdff544e537d7044e53e1d490149.php
	app/cache/dev/twig/58/79/65dec93435085f6d71b95a0a4a7b1f6eb32a012c09f499cb06fa4808bbb7.php
	app/cache/dev/twig/5a/4d/5f271d0969d28a5dbaf23a49a47a3f15ab32e55e899219691fb7949db0d2.php
	app/cache/dev/twig/5a/9f/19b8d324181bde1b0bfa015336d09a24d6ac178053ec513453746fcbdd2c.php
	app/cache/dev/twig/5d/5d/01c64f64c1a87e344fcf13a57083ae546eb79ae71807259d5004c2ad73b2.php
	app/cache/dev/twig/63/8a/9d8e60677e7f6ffe58db42b899d28b83c08a387dfee6fa671bfa82c2634c.php
	app/cache/dev/twig/64/49/ae2638c40997fcf5df4cafb77e97b6739a6386441db9d684bac9c8524a4b.php
	app/cache/dev/twig/64/6a/d06b4f0afe26f1359702b05aac85a99b6707b346fe63672414f328a724d6.php
	app/cache/dev/twig/6b/3e/898dab7ea47ccbc12c9717fbe53e011efd1742b356aeb2d1d722dc22dc81.php
	app/cache/dev/twig/6c/f8/8836288a8799e6619a7958acb80634604e76680d320dffe7bc8d9f38b193.php
	app/cache/dev/twig/70/a5/f15da7cd4ca396095b1e242177cb6e84796bf18dc29e875e0599c6f443d6.php
	app/cache/dev/twig/71/1e/61bfbd976d4dbf350695ed92828ec2c62668b42ee95a523d28adb9e9b75d.php
	app/cache/dev/twig/73/d9/f9765b37b37a29965c34b2c38f68b3bd5359e27f88b42a62691e6f149a09.php
	app/cache/dev/twig/74/6c/012270cbfd39eddbb98bdc161908396068745acd4bcf5e9b2228958568f4.php
	app/cache/dev/twig/74/fa/9823d783bcb7b9fcb2f7964de26b3c3f7c8ab55d65fec885017531329591.php
	app/cache/dev/twig/75/9b/315372c913eef058abf80125dffa79d893d8034d6539b7c0fdb19aa3570e.php
	app/cache/dev/twig/76/40/07dc863490be2ca2575c00ee71d0074423a051a877ff8dbfe691d3d728b4.php
	app/cache/dev/twig/76/66/b74864a95daa8bbd771ad28417b31911f591749af4c638a05ebef51117f8.php
	app/cache/dev/twig/76/d3/fad052cfecc2f1d08676677d54a6c311be40b343cf8cf2e09c2c7c06ecbb.php
	app/cache/dev/twig/76/f8/8c356111606b208492dc21e575c4230c22c16b6b524dbf91fb900c9544ce.php
	app/cache/dev/twig/79/09/1ce6d33b3723635b9d79afe816e7e15a3d53d492cdeba8e9bec121bf35da.php
	app/cache/dev/twig/7e/60/e27650a3041522627fbf5297e2c87e48fe60f8e504e8ed653826b2a6c9e9.php
	app/cache/dev/twig/7f/dc/39a147de526d66851ba51d8509c90c8692e94ab074e7f35336c37a42111a.php
	app/cache/dev/twig/84/1b/87a200ab7e2268191c7116a175f5627201a4e465d750780374b68d37b1c4.php
	app/cache/dev/twig/85/34/ba1878711a3657a8b77227930349d0a5db4884acdc38afa689aee166311f.php
	app/cache/dev/twig/87/6c/4e5c56371ce0e99f3708c7e7247f3f92d164d5e012d39ad69b4a4b9b42e2.php
	app/cache/dev/twig/8e/ea/8e22ee2a12f2c07641758a11364abde4a30bfdcc6df868f48f00d3eac98c.php
	app/cache/dev/twig/8f/da/04671b8ef27f4dcbd9d5438e6a29eeb3a58f33b4877ac8cf97d5175473c6.php
	app/cache/dev/twig/91/fc/b1284f7b1f5b181ca5ecc3ab1e0c2fe518ee24587f405bb658fa67a5cfe4.php
	app/cache/dev/twig/92/cd/35e05f6c3e17494ab8b1570580c4036c96664c9117e597c40f83bf6d56ea.php
	app/cache/dev/twig/94/2b/963e67b385dc242f453acda808b2a26f8f753faef235311b9e2f5b60cc7d.php
	app/cache/dev/twig/98/08/72cee342a4667da687b51980346e4978aa0181e5baccc97718b275731ea2.php
	app/cache/dev/twig/9a/b4/5cd798a399a6d4cdc5cc09d53df5532ae45c1d90f7b844f5d5e074cc7db7.php
	app/cache/dev/twig/9b/5f/cdd9d69bea949d2a4a17e03afa6f977ddafb7034fdcd108e7958dc0c38f0.php
	app/cache/dev/twig/a8/c2/4ef89f9e2af037e1a8b9c981331deea1e03e694d0075fb1fa8f76d4d9107.php
	app/cache/dev/twig/ad/31/d17259b057323e7ca95e86cf95227011ed9bd5435cb2595504a2f71c8c99.php
	app/cache/dev/twig/ad/8f/2c95c1e59b2f97890e2d5a5fa49cdd74faf96802bd9b0a608723387503aa.php
	app/cache/dev/twig/b3/71/2a1d5c3a898b25eea736bcb7a2d5543aab29458e8bf8ab55fd52eca880dc.php
	app/cache/dev/twig/b5/ec/2440d3124b731c836feff0796d173ed2c654a866055f7fa71e1f128a4a69.php
	app/cache/dev/twig/b7/a8/50542e3f31778fdd1ccddabe6af2ac422a1e629bf6ab6840ecbcf4b2bab6.php
	app/cache/dev/twig/c2/27/9857a778520188520513c2d453384b878fc5642f32a2c5512191056cc810.php
	app/cache/dev/twig/c4/20/6325451c2844c28abbc526a3511f6b24306a43cc6d6afc231896e608fbd3.php
	app/cache/dev/twig/c5/95/ffea51562dcd7d6597213db86526763116347354123ddbcc6d6253c843f9.php
	app/cache/dev/twig/cb/26/9cf2136e96cf7ed2d061b36981274bec6d3889b52140168d9ff7cb402312.php
	app/cache/dev/twig/cb/ac/91b86a0cf487ec49a55083e2c1dd3b0a33ee65eca9ca953402cdee765f13.php
	app/cache/dev/twig/cf/45/ffd3f37cebfa69aba6bb5fc954a46c074b8a3cb2675916b250dd812fe360.php
	app/cache/dev/twig/d0/9a/b1e1e279d8353cb94c9bf0c06be60faf0591e52ea601739e2dce273c7b1d.php
	app/cache/dev/twig/d4/15/224960cf52b7fba423fd7a43fde26cc6934dd959a428b16ab70da85f7515.php
	app/cache/dev/twig/d5/86/26b1363454c880a6d549861539501a8bac62c0313a4d2d78c49fe83ea94a.php
	app/cache/dev/twig/d9/d3/b0b3338971b3f4faacd8e5af22dff52bbcb301158c4ba9cbf99435c86dcd.php
	app/cache/dev/twig/db/c1/eb35cacc4ad815635de059c9def4d254c58346db17853f8639acd7602457.php
	src/Bdls/ProjetBundle/Resources/views/Default/home.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/layout.html.twig
	web/bundles/projet/css/style.css
Correction problèmede merge + intégration bootstrap
Conflict corrigé:
	src/Bdls/ProjetBundle/Resources/views/Default/home.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/layout.html.twig
	web/bundles/projet/css/style.css

Problème du select à resoudre : créer un input hiden