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 changelog and metadata file

pull/1540/head
Stergios Mekras 2022-03-04 01:06:14 +01:00
parent 0a798aa5e7
commit 7c46d95119
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/smclock/ChangeLog
View File

@ -1,8 +1,4 @@
0.01: Initial version 0.01: Initial version
0.02: Add battery level 0.02: Add battery level
<<<<<<< HEAD
0.03: fix battery level displaying
=======
0.03: Fix battery display when full 0.03: Fix battery display when full
0.04: Add support for settings 0.04: Add support for settings
>>>>>>> feature/introduce_settings

13
apps/smclock/metadata.json
View File

@ -1,23 +1,10 @@
{ {
<<<<<<< HEAD
"id":"smclock",
"name":"Monogram Watch Face",
"shortName":"MonoClock",
"icon":"app.png",
<<<<<<< HEAD
"version":"0.03",
=======
"screenshots": [{"url":"screenshot.png"}],
"version":"0.02",
>>>>>>> 29432bb9 (Add screenshot)
=======
"id": "smclock", "id": "smclock",
"name": "Monogram Watch Face", "name": "Monogram Watch Face",
"shortName": "MonoClock", "shortName": "MonoClock",
"icon": "app.png", "icon": "app.png",
"screenshots": [{ "url": "screenshot.png" }], "screenshots": [{ "url": "screenshot.png" }],
"version": "0.04", "version": "0.04",
>>>>>>> feature/introduce_settings
"description": "A simple watchface based on my stylised monogram.", "description": "A simple watchface based on my stylised monogram.",
"type": "clock", "type": "clock",
"tags": "clock", "tags": "clock",