Rebase on main

jemgillam · jemgillam · commit b0643fa5f164 · 2026-04-21T11:32:52.000+01:00
diff --git a/website/src/components/Sponsor/styles.module.css b/website/src/components/Sponsor/styles.module.css
@@ -8,13 +8,10 @@
   padding: 1rem;
   flex: 0 0 18rem;
   font-size: 1.2rem;
-<<<<<<< HEAD
-=======
 }
 
 .leaders {
   flex: 0 0 12rem;
->>>>>>> Finish initial styling to match crystal websites
 }
 
 .featured,
diff --git a/website/src/pages/sponsors.mdx b/website/src/pages/sponsors.mdx
@@ -75,7 +75,6 @@ to fund ongoing development on Graphile Worker through sponsorship. THANK YOU!
   <Sponsor name="Dimply" avatar="/images/sponsors/dimply.svg" business />
   <Sponsor name="Ndustrial" avatar="/images/sponsors/ndustrial.png" business />
   <Sponsor name="Beacon" avatar="/images/sponsors/beaconbio.jpg" business />
-  <Sponsor
   <Sponsor name="Ravio" avatar="/images/sponsors/Ravio.svg" business />
   <Sponsor name="prodready" />
   <Sponsor

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,10 @@`
`8`	`8`	`padding: 1rem;`
`9`	`9`	`flex: 0 0 18rem;`
`10`	`10`	`font-size: 1.2rem;`
`11`		`-<<<<<<< HEAD`
`12`		`-=======`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`.leaders {`
`16`	`14`	`flex: 0 0 12rem;`
`17`		`->>>>>>> Finish initial styling to match crystal websites`
`18`	`15`	`}`
`19`	`16`
`20`	`17`	`.featured,`