From fbfb7c89d6920a7e21ea45f51305282f6c2eb4f5 Mon Sep 17 00:00:00 2001
From: Reed Nightingale <reed.nightingale@gmail.com>
Date: Sat, 4 Jan 2020 01:50:17 -0800
Subject: [PATCH] Fix merge issue

---
 setup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cpp b/setup.cpp
index 7e9b3d2..fa4915c 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -111,7 +111,7 @@ void setupFreq(){
   strcpy_P(c,(const char*)F("Rotate to zerobeat"));
   displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_ITEM_Y + 4*LAYOUT_ITEM_PITCH_Y, LAYOUT_ITEM_WIDTH, LAYOUT_ITEM_HEIGHT, COLOR_TEXT, COLOR_BACKGROUND, COLOR_BACKGROUND);
   
-  ltoa(calibration, b, 10);
+  ltoa(globalSettings.oscillatorCal, b, 10);
   displayText(b, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_TITLE_BACKGROUND, COLOR_BACKGROUND);
   //keep clear of any previous button press
   while (btnDown())