Skip to content

Commit

Permalink
Merge pull request #8 from UniversityRadioYork/i-fucked-the-merge-con…
Browse files Browse the repository at this point in the history
…flict-resolution

I fucked the merge conflict resolution
  • Loading branch information
JP5457 committed Oct 29, 2023
2 parents 991b1ac + 65a3530 commit 03dcb97
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ body {
margin-top: -2rem;
border-radius: 2rem 2rem 0 0;
padding-top: 2rem;

}
.pageTitleImage{
max-inline-size: 90%;
max-height: 15rem;
Expand Down

0 comments on commit 03dcb97

Please sign in to comment.