background

assets/styles/app.scss

@@ -5,10 +5,7 @@ $yellow: #fde16d;
 @import "~bootstrap/scss/bootstrap";
 
 body {
-<<<<<<< HEAD
     background-image: url('../images/fond.jpg');
-=======
->>>>>>> develop
     padding-top:5rem;
     padding-bottom:4rem;
 }