Stab at #894 (comment)

solid · Jun 14, 2024 · b842b58 · b842b58
1 parent 945ca4d
commit b842b58
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/_config.yml b/_config.yml
@@ -16,11 +16,15 @@
 title: Solid
 email: [email protected]
 url: 'https://solidproject.org/'
+<<<<<<< HEAD
 twitter_username: project_solid
+=======
+>>>>>>> e1cf25a (Stab at https://github.com/solid/solidproject.org/issues/894#issuecomment-2144677278)
 github_username: solid
 repository: solid/solidproject.org
 include: 
   - _redirects
+<<<<<<< HEAD
 
 # Build settings
 markdown: kramdown
@@ -50,3 +54,5 @@ kramdown:
   syntax_highlighter_opts:
     # Use existing pygments syntax highlighting css
     css_class: 'highlight'
+=======
+>>>>>>> e1cf25a (Stab at https://github.com/solid/solidproject.org/issues/894#issuecomment-2144677278)