Remove some content that is (hopefully) no longer used

_config.yml

@@ -16,43 +16,7 @@
 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
-future: true
-theme: minima
-plugins:
-  - jekyll-feed
-  - jekyll-redirect-from
-  - jekyll-autolink_email
-  # Exclude from processing.
-# The following items will not be processed, by default. Create a custom list
-# to override the default setting.
-# exclude:
-#   - Gemfile
-#   - Gemfile.lock
-#   - node_modules
-#   - vendor/bundle/
-#   - vendor/cache/
-#   - vendor/gems/
-#   - vendor/ruby/
-
-kramdown:
-  input: GFM
-  # GitHub Pages only supports rouge for syntax highlighting:
-  # https://github.blog/2016-02-01-github-pages-now-faster-and-simpler-with-jekyll-3-0/#the-highlight-zone
-  syntax_highlighter: rouge
-  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)