WebOfTrustInfo/satyrn

merge bug

Closed this issue · 1 comments

jandrieu commented 
$ npm start

> satyrn@0.0.0 start C:\Users\Joe\Documents\projects\Satyrn\satyrn
> node build/start.js

 ERROR  Failed to compile with 1 errors18:12:34

 error  in ./src/menu/file_menu_template.js

Syntax Error: SyntaxError: C:\Users\Joe\Documents\projects\Satyrn\satyrn\src\menu\file_menu_template.js: Unexpected token (9:0)

   7 |   submenu: [
   8 |     {
>  9 | <<<<<<< HEAD
     | ^
  10 | =======
  11 |       label: "Edit Mode",
  12 |       type: "checkbox",


 @ ./src/background.js 10:0-61 17:17-33
jandrieu commented

non-issue. Just a mistake on my side.