fix: resolve conflict

This commit is contained in:
Cory Dransfeldt 2024-02-25 12:26:06 -08:00
commit 2409cba076
No known key found for this signature in database
3 changed files with 24 additions and 1 deletions

View file

@ -2,14 +2,18 @@ export default {
'11ty': '#Eleventy',
accessibility: '#Accessibility',
ai: '#AI',
'black metal': '#BlackMetal',
blogging: '#Blogging',
books: '#Books',
css: '#CSS',
'death metal': '#DeathMetal',
development: '#WebDev',
eleventy: '#Eleventy',
email: '#Email',
emo: '#Emo',
fastmail: '#Email',
gmail: '#Email',
grindcore: '#Grindcore',
ios: '#iOS #Apple',
javascript: '#JavaScript',
'last.fm': '#Music',