FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary merge info from main app file

pull/1540/head
Stergios Mekras 2022-03-04 01:09:11 +01:00
parent 7c46d95119
commit a4c76e3d3a
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/smclock/app.js
View File

@ -83,13 +83,8 @@ function getBatteryColor(level) {
function draw() {
g.drawImage(background);
<<<<<<< HEAD
const color = getBatteryColor();
const bat = E.getBattery() + "%";
=======
const color = getBatteryColor(batLevel);
var bat = "";
>>>>>>> feature/introduce_settings
const d = new Date();
const day = d.getDate();
const month = d.getMonth() + 1;
@ -118,9 +113,6 @@ function draw() {
g.drawString("Bat:", 10, 22, false);
}
g.setColor(color[0], color[1], color[2]);
<<<<<<< HEAD
g.drawString(bat, 46, 22, false);
=======
if (batLevel < 100) {
g.drawString(bat, 52, 22, false);
} else {
@ -171,7 +163,6 @@ function draw() {
g.setFont("6x8", 5);
g.drawString(time, 14, 112, false);
}
>>>>>>> feature/introduce_settings
}
loadSettings();