polscm32 52b6f516c2 solve merge conflicts %!s(int64=2) %!d(string=hai) anos
..
DataModel.swift 3e0a5a261b remove unnecessary code %!s(int64=2) %!d(string=hai) anos
MainChartView.swift a8a5457b9f pull in latest dev and solve merge conflicts %!s(int64=2) %!d(string=hai) anos
MainChartView2.swift 56b8010b04 increase height of main chart and change high color of highGlucose RuleMark %!s(int64=2) %!d(string=hai) anos