From fc3fcb6ab047d71f14c2e61055434a11f2451b8d Mon Sep 17 00:00:00 2001
From: Fabian42 <Fabian42@users.noreply.github.com>
Date: Mon, 18 Dec 2023 04:28:57 +0000
Subject: [PATCH] temp

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

diff --git a/temp.json b/temp.json
index e4d7f6f..d29b131 100644
--- a/temp.json
+++ b/temp.json
@@ -1,6 +1,4 @@
 {"keywords":[
-<<<<<<< HEAD
-=======
  {"keyword":"test"},
  {"keyword":"abc"},
  {"keyword":"foo"},
@@ -9,5 +7,4 @@
  {"keyword":"\\\# hash"},
  {"keyword":"\\\\"},
  {"keyword":"\\\\\# hashtesting"}
->>>>>>> 4d781ad2c9a562e693caf5d259f933c8c575ff21
 ]}