From b1a42c4cd720cc805b7521613bf2184802a7153b Mon Sep 17 00:00:00 2001
From: Victor Seiji Hariki <victorseijih@gmail.com>
Date: Tue, 13 Dec 2022 11:13:46 -0300
Subject: [PATCH] seems I failed to save the file before closing merge

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
---
 js/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/index.js b/js/index.js
index 5d76340..04c3a98 100644
--- a/js/index.js
+++ b/js/index.js
@@ -910,11 +910,7 @@ function loadSettings() {
 			: localStorage.getItem("enable_hr")
 	);
 	var _sync_cursor_size = Boolean(
-<<<<<<< HEAD
 		localStorage.getItem("sync_cursor_size") == (null || "true")
-=======
-		localStorage.getItem("sync_cursor_size") == (null || "false")
->>>>>>> zero/main
 			? false
 			: localStorage.getItem("sync_cursor_size")
 	);