From 0cb93c49257ff77cc5e4c9acd69f849899cde017 Mon Sep 17 00:00:00 2001
From: vykend <mail@martinvylet.cz>
Date: Fri, 16 Jun 2023 09:44:32 +0200
Subject: [PATCH] Update 'RestoolsBBWatchReloaded.js'

---
 RestoolsBBWatchReloaded.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/RestoolsBBWatchReloaded.js b/RestoolsBBWatchReloaded.js
index 11bdeb3..bcc3714 100644
--- a/RestoolsBBWatchReloaded.js
+++ b/RestoolsBBWatchReloaded.js
@@ -1,11 +1,7 @@
 // ==UserScript==
 // @name           IITC plugin: ResTools BB Watch Reloaded
 // @namespace      https://git.martinvylet.cz/vykend/ResTools-BB-Watch-Reloaded
-<<<<<<< HEAD
-// @version        0.6
-=======
-// @version        0.5.2
->>>>>>> 05b76cec5c49b9a62d1b257c90d75c8e9252fb89
+// @version        0.6.1
 // @description    Scan window for BBs on ornamented portals, then check results
 // @author         vikend
 // @icon