From 8c48fd3e0e350f861054c4a6eaf5f06f8f8faeda Mon Sep 17 00:00:00 2001
From: Gijs Reijn <gijsreijn@hotmail.com>
Date: Fri, 15 Nov 2024 09:24:14 +0100
Subject: [PATCH] Resolve conflict

---
 .github/actions/spelling/expect/generic_terms.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/spelling/expect/generic_terms.txt b/.github/actions/spelling/expect/generic_terms.txt
index e259b510..ae563bea 100644
--- a/.github/actions/spelling/expect/generic_terms.txt
+++ b/.github/actions/spelling/expect/generic_terms.txt
@@ -18,4 +18,4 @@ sortby
 ssh
 usr
 versioning
-VGpu
+