chore: resolve conflict

This commit is contained in:
Cory Dransfeldt 2024-06-09 11:16:59 -07:00
parent 88a4ec4acd
commit cc70f14f03
No known key found for this signature in database

View file

@ -72,12 +72,11 @@
# general # general
/articles/ / 301 /articles/ / 301
/tags /search 301
/referrals /save 301
/recent/movies /watching/recent/movies 301 /recent/movies /watching/recent/movies 301
/recent/shows /watching/recent/shows 301 /recent/shows /watching/recent/shows 301
/mastodon https://social.lol/@cory 301 /mastodon https://social.lol/@cory 301
/coffee https://www.buymeacoffee.com/cory 301 /coffee https://www.buymeacoffee.com/cory 301
/tags /search 301
/tags/* /search 301 /tags/* /search 301
/music/genre/* /music/genres/:splat 301 /music/genre/* /music/genres/:splat 301