From 7fb09280fcdcecf777247b55413385aff2753532 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 27 Aug 2025 10:39:05 +0100
Subject: [PATCH] Update general_words_lang.php

---
 application/language/swedish/general_words_lang.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php
index ff042cc1..f01f7dc0 100644
--- a/application/language/swedish/general_words_lang.php
+++ b/application/language/swedish/general_words_lang.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 
 defined('BASEPATH') OR exit('No direct script access allowed');