From 8a41d6eb854f498d631d5788f60e806c188ab1de Mon Sep 17 00:00:00 2001
From: sfarouq-ext <116093375+sfarouq-ext@users.noreply.github.com>
Date: Tue, 4 Mar 2025 16:10:58 +0100
Subject: [PATCH] rebased

---
 tests/resources/spellcheck/stopwords.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/resources/spellcheck/stopwords.txt b/tests/resources/spellcheck/stopwords.txt
index 2f2b3b04f..2cd65e02f 100644
--- a/tests/resources/spellcheck/stopwords.txt
+++ b/tests/resources/spellcheck/stopwords.txt
@@ -110,10 +110,7 @@ in-mcast
 interface-dsl-name
 InterrupibleSleep
 in-ucast
-<<<<<<< HEAD
 io-cards
-=======
->>>>>>> 17fa93985 (spellcheck)
 iops
 IpAddr
 ip-label