From fe4727ec305e9986c789644c42b28f0017aadaca Mon Sep 17 00:00:00 2001
From: theom <theo.montaigu@gmail.com>
Date: Sat, 18 Feb 2023 19:44:04 +0100
Subject: [PATCH] merge master into fix_data branch and resolve conflicts

---
 .../com/simplemobiletools/calculator/activities/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
index 88c2cca7..73d1ae44 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
@@ -297,6 +297,6 @@ class MainActivity : SimpleActivity(), Calculator {
         bundle.putDouble("savedBaseValue", calc.baseValue)
         bundle.putDouble("savedSecondValue", calc.getSecondValueV2())
         bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula)
-
+    }
     //============================================================
 }