From 268a243cb495ef4eb414f9dd5a91c630182d3abb Mon Sep 17 00:00:00 2001
From: Tomas Norre Mikkelsen <tomasnorre@gmail.com>
Date: Thu, 22 Feb 2024 22:24:59 +0100
Subject: [PATCH] Remove extra line in config.json

---
 config.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.json b/config.json
index 0a4a2df8..ac86d4de 100644
--- a/config.json
+++ b/config.json
@@ -1195,7 +1195,6 @@
         "practices": [],
         "prerequisites": [],
         "difficulty": 3
-<<<<<<< HEAD
       },
       {
         "slug": "rotational-cipher",