- @@ -480,13 +480,10 @@ font-size: 1.7rem; -<<<<<<< HEAD -======= - ->>>>>>> master @@ -503,13 +500,10 @@ font-size: 1.7rem; -<<<<<<< HEAD -======= - ->>>>>>> master
-<<<<<<< HEAD -======= - ->>>>>>> master @@ -503,13 +500,10 @@ font-size: 1.7rem; -<<<<<<< HEAD -======= - ->>>>>>> master