merge master into fix_data branch and resolve conflicts

2023-02-18 19:44:04 +01:00 · 2023-02-18 19:44:04 +01:00 · fe4727ec30
parent 9bd8786e2a
commit fe4727ec30
1 changed files with 1 additions and 1 deletions
--- 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)
-
+    }
    //============================================================
 }