Skip to content
Snippets Groups Projects
Commit 82bee9b1 authored by SAVERGNE Yvan's avatar SAVERGNE Yvan
Browse files

Merge branch 'master' into 'main'

Master

See merge request !60
parents 881f8798 df51f302
No related branches found
No related tags found
1 merge request!60Master
......@@ -277,7 +277,6 @@ button {
width: 51px;
}
<<<<<<< HEAD
.table_notif {
align-self: center;
width: 100%;
......@@ -286,7 +285,8 @@ button {
.table_notif tr td {
text-align: center;
=======
}
.choix-abonnement {
display: flex;
justify-content: space-around;
......@@ -313,5 +313,4 @@ button {
.type-abonnement.selected {
background-color: green;
color: white;
>>>>>>> e333f30cd614a9adb1ed98b040c0cc0feeeb487c
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment