From 2c00034334276391b4a534afc2cfeb4d61831a6c Mon Sep 17 00:00:00 2001
From: LordGhostX <solomonghost9@gmail.com>
Date: Wed, 14 Feb 2024 16:04:25 +0100
Subject: [PATCH] update cspell

---
 .cspell.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.cspell.json b/.cspell.json
index 329cec6..62b8370 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -76,12 +76,9 @@
     "faucet",
     "concat",
     "certonly",
-<<<<<<< HEAD
     "txid",
-=======
     "baarerstrasse",
     "FDPIC",
->>>>>>> 412a1c8 (fix cspell words (#160))
   ],
   "flagWords": [],
   "ignorePaths": [