From 344d1e393721f0acbc5376cd5f5b784b642d747b Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Thu, 8 Apr 2021 19:12:11 +0100
Subject: [PATCH] fixed merge issue

---
 src/js/test/test-logic.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index 68c478ff3..82401412e 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -1713,7 +1713,7 @@ export function finish(difficultyFailed = false) {
     $("#result .stats .source").addClass("hidden");
   }
 
-  if (Funbox.active !== "none") {
+  if (Funbox.funboxSaved !== "none") {
     ChartController.result.options.annotation.annotations.push({
       enabled: false,
       type: "line",
@@ -1734,7 +1734,7 @@ export function finish(difficultyFailed = false) {
         cornerRadius: 3,
         position: "left",
         enabled: true,
-        content: `${Funbox.active}`,
+        content: `${Funbox.funboxSaved}`,
         yAdjust: -11,
       },
     });