Github Merge Conflict

Ahh - ok, so you created a pull request, and now you need to merge it...

• click 'Pull requests' up top left https://github.com/andrewgoz/BangleApps/­pulls
  
• click on the PR - https://github.com/andrewgoz/BangleApps/­pull/1
  
• click Resolve conflicts down the bottom
  
• do what I mentioned in the last post
  
  

I took a look and I think the end of the finished file should look like:

  {
    "id": "qalarm",
    "name": "Q Alarm and Timer",
    "shortName": "Q Alarm",
    "icon": "app.png",
    "version": "0.02",
    "description": "Alarm and timer app with days of week and 'hard' option.",
    "tags": "tool,alarm,widget",
    "supports": ["BANGLEJS", "BANGLEJS2"],
    "storage": [
      { "name": "qalarm.app.js", "url": "app.js" },
      { "name": "qalarm.boot.js", "url": "boot.js" },
      { "name": "qalarm.js", "url": "qalarm.js" },
      { "name": "qalarmcheck.js", "url": "qalarmcheck.js" },
      { "name": "qalarm.img", "url": "app-icon.js", "evaluate": true },
      { "name": "qalarm.wid.js", "url": "widget.js" }
    ],
    "data": [{ "name": "qalarm.json" }]
  },
    "id": "emojuino",
    "name": "Emojuino",
    "shortName": "Emojuino",
    "version": "0.01",
    "description": "Emojis & Espruino: broadcast Unicode emojis via Bluetooth Low Energy.",
    "icon": "emojuino.png",
    "tags": "emoji",
    "supports" : [ "BANGLEJS2" ],  
    "readme": "README.md",
    "storage": [
      { "name": "emojuino.app.js", "url": "emojuino.js" },
      { "name": "emojuino.img", "url": "emojuino-icon.js", "evaluate": true }
    ]
  },
  {
    "id": "cliclockJS2Enhanced",
    "name": "Commandline-Clock JS2 Enhanced",
    "shortName": "CLI-Clock JS2",
    "version": "0.1",
    "description": "Simple CLI-Styled Clock with enhancements. Modes that are hard to use and unneded are removed (BPM, battery info, memory ect) credit to hughbarney for the original code and design",
    "icon": "app.png",
    "screenshots": [{"url":"screengrab.png"}],
    "type": "clock",
    "tags": "clock,cli,command,bash,shell",
    "supports": ["BANGLEJS","BANGLEJS2"],
    "allow_emulator": true,
    "storage": [
      {"name":"cliclockJS2Enhanced.app.js","ur­l":"app.js"},
      {"name":"cliclockJS2Enhanced.img","url":­"app.icon.js","evaluate":true}
    ]
},
{
    "id": "authentiwatch",
    "name": "2FA Authenticator",
    "shortName": "AuthWatch",
    "icon": "app.png",
    "screenshots": [{"url":"screenshot.png"}],
    "version": "0.01",
    "description": "Google Authenticator compatible tool.",
    "tags": "tool",
    "interface": "interface.html",
    "supports": ["BANGLEJS", "BANGLEJS2"],
    "readme": "README.md",
    "allow_emulator": true,
    "storage": [
      {"name":"authentiwatch.app.js","url":"ap­p.js"},
      {"name":"authentiwatch.img","url":"app-i­con.js","evaluate":true}
    ],
    "data": [{"name":"authentiwatch.json"}]
  }
]

hope that helps!