merge master into fix_data branch and resolve conflicts
This commit is contained in:
parent
9bd8786e2a
commit
fe4727ec30
|
@ -297,6 +297,6 @@ class MainActivity : SimpleActivity(), Calculator {
|
||||||
bundle.putDouble("savedBaseValue", calc.baseValue)
|
bundle.putDouble("savedBaseValue", calc.baseValue)
|
||||||
bundle.putDouble("savedSecondValue", calc.getSecondValueV2())
|
bundle.putDouble("savedSecondValue", calc.getSecondValueV2())
|
||||||
bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula)
|
bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula)
|
||||||
|
}
|
||||||
//============================================================
|
//============================================================
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue