From 58c4ff29c083e66b8c533ca6876e9aa664da8262 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Fri, 28 Mar 2025 18:18:46 -0700
Subject: [PATCH] fix(base/index.css): add missing class for forgejo coloring

---
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 src/assets/styles/base/index.css | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a9605c7..82715a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "1.1.3",
+      "version": "1.1.4",
       "license": "MIT",
       "dependencies": {
         "minisearch": "^7.1.2",
diff --git a/package.json b/package.json
index 2d012fe..f857578 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {
diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css
index 0e75930..76bc386 100644
--- a/src/assets/styles/base/index.css
+++ b/src/assets/styles/base/index.css
@@ -119,6 +119,7 @@ ol {
 .favorite,
 .forgejo,
 .github,
+.git-merge,
 .headphones,
 .heart-handshake,
 .info-circle,