nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5

1 files changed, 1186 insertions, 0 deletions

diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index bcbeeca306af..aa31c6b141bd 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -112,7 +112,39 @@ let
         sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug==";
       };
     };
+<<<<<<< HEAD
     "@types/node-10.5.0" = {
+=======
+    "@types/caseless-0.12.1" = {
+      name = "_at_types_slash_caseless";
+      packageName = "@types/caseless";
+      version = "0.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz";
+        sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n";
+      };
+    };
+    "@types/form-data-2.2.1" = {
+      name = "_at_types_slash_form-data";
+      packageName = "@types/form-data";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz";
+        sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4";
+      };
+    };
+<<<<<<< HEAD
+    "@types/node-10.3.1" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "10.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz";
+        sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92";
+      };
+    };
+    "@types/node-8.10.18" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "_at_types_slash_node";
       packageName = "@types/node";
       version = "10.5.0";
@@ -126,11 +158,74 @@ let
       packageName = "@types/node";
       version = "8.10.20";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz";
         sha512 = "M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==";
       };
     };
     "@webassemblyjs/ast-1.5.12" = {
+=======
+        url = "https://registry.npmjs.org/@types/node/-/node-9.6.20.tgz";
+        sha512 = "03zcm94d4k4hmyilhw27w8ixxm2bkkr2my3d344viq4dzadjmzc9vyabyfs085j6a3qdv1ns0bbw5m72511bwq885064cpnn58ig0wq";
+=======
+    "@types/node-10.3.2" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "10.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-10.3.2.tgz";
+        sha512 = "3w50bh9i0rl27vnrn4mmwjphccfaybj74ydfymjmq46p8dfllfwm37lgxqjrx0mp6hrdia5hllbwnpsx2a4wwwck9hh9dkp798c9mzl";
+      };
+    };
+    "@types/node-8.10.19" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "8.10.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.19.tgz";
+        sha512 = "3wi74w4fjk1zjwa8sijb2a8n6c0ynl48k8za2rwawm7332kncqm0jsg4xx7vkz25fzh16x852can18bc1n859gnsfqy9d43ivp3kxgq";
+      };
+    };
+    "@types/node-9.6.21" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "9.6.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-9.6.21.tgz";
+        sha512 = "3n2g5wdwppphgaxing5vdzidpiggibfdwci4l522hm4v4p49gas7fsld0k51g8vf09k65y7d4cq6h0dr76sbrsvy58wn4pigjcbl16d";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      };
+    };
+    "@types/request-2.47.0" = {
+      name = "_at_types_slash_request";
+      packageName = "@types/request";
+      version = "2.47.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz";
+        sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw";
+      };
+    };
+    "@types/tough-cookie-2.3.3" = {
+      name = "_at_types_slash_tough-cookie";
+      packageName = "@types/tough-cookie";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz";
+        sha512 = "1hpxnn86rnm17kxbwp8r3ymx3qqmvq6vhswndr12cahvbarmm27mj2jj2r0pm0w9wvq9ixm55whl8q029ir29c59cmanbais720nd1h";
+      };
+    };
+    "@types/uuid-3.4.3" = {
+      name = "_at_types_slash_uuid";
+      packageName = "@types/uuid";
+      version = "3.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz";
+        sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75";
+      };
+    };
+<<<<<<< HEAD
+    "@webassemblyjs/ast-1.5.10" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
       version = "1.5.12";
@@ -288,8 +383,175 @@ let
       packageName = "@webassemblyjs/wast-printer";
       version = "1.5.12";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz";
         sha512 = "XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA==";
+=======
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz";
+        sha512 = "3qwkz89g5fgn3hwbm7fb4v0zdgq2vr8nb98cg4w0r5za21xry06m8yzwka5j6h9qxz2qqxy019mfxxga03c0g8v8lw5fkf4d4kdk34z";
+=======
+    "@webassemblyjs/ast-1.5.12" = {
+      name = "_at_webassemblyjs_slash_ast";
+      packageName = "@webassemblyjs/ast";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz";
+        sha512 = "06c896q5ljznnp6rbln2lwfxccp7cx9bxpzcc73arj9xlcxkd9aj3ag9ghdx9xmysqq2xawmzplwk77ns2l0y9gfhx2b1dfmc8c2r3f";
+      };
+    };
+    "@webassemblyjs/floating-point-hex-parser-1.5.12" = {
+      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+      packageName = "@webassemblyjs/floating-point-hex-parser";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz";
+        sha512 = "01128bl9i9hffn7kgznfdqvrvb9l6ff1njj486qn2cywjd0skwb816cnmc55cvksmyvfkg9ijsmxj7sjlpiv7fp2d9zl80fvj8yz53s";
+      };
+    };
+    "@webassemblyjs/helper-api-error-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-api-error";
+      packageName = "@webassemblyjs/helper-api-error";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz";
+        sha512 = "3152r3s7k5w80l4a3y8j37y3s565l0ggxbl3li5m9g0x0ykl2iccafdq0j13v5hvxmj5y6i1bvxz31da99mrjy1p6ybmg49rs1mm30s";
+      };
+    };
+    "@webassemblyjs/helper-buffer-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-buffer";
+      packageName = "@webassemblyjs/helper-buffer";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz";
+        sha512 = "1drz3nvcs4qn2wx651x491ryvj5gc8d7gqrw4lxciyp864s8l8i0fpbz3b94wfirrhq39kzp4sk96gxz0a2zjigi5i2rr2bvf7594xl";
+      };
+    };
+    "@webassemblyjs/helper-code-frame-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-code-frame";
+      packageName = "@webassemblyjs/helper-code-frame";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz";
+        sha512 = "0qczm2a2xv701d334lja7ickkc0l9zbbxv3n6nl3dgbh9dn82qhvg9ffxz7c5j1fsda28jbr6z3b2ah7qxq7qpk681w9y4k4j1cjnnh";
+      };
+    };
+    "@webassemblyjs/helper-fsm-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-fsm";
+      packageName = "@webassemblyjs/helper-fsm";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz";
+        sha512 = "0sl4gp0r7g3sw224lm1xhw8w0l24fs17xr866b8hc1lhj0pv6xcqx4s8w0mlpdvafyl0vk1gvs95d6639d51bw2r7a9wl2gjpixj4a0";
+      };
+    };
+    "@webassemblyjs/helper-module-context-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-module-context";
+      packageName = "@webassemblyjs/helper-module-context";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz";
+        sha512 = "0f0a2p3gpjpbk1gapgprlawpfp69i9c4zbf9awb29rchdlcdg6vipkiylvshfzv3nzp2qdw1rapyvpi1rqg8wn7vn397q682grd29a8";
+      };
+    };
+    "@webassemblyjs/helper-wasm-bytecode-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+      packageName = "@webassemblyjs/helper-wasm-bytecode";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz";
+        sha512 = "3m81d4f4n6rv469xr35z8i795rzs8c9y1q1isz3agcjgjrkq60ch7p47mmcr1pmbd03mywzsp0ld34qqh42p4xkam6lkg1j0yazjv6h";
+      };
+    };
+    "@webassemblyjs/helper-wasm-section-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-section";
+      packageName = "@webassemblyjs/helper-wasm-section";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz";
+        sha512 = "2ilcq6wa6spyzbnsk936f3jhp66hh9qbil4xdrm5qkldkyifyxc399gnn8lldsnbgk6zik1h8cyvhzfj21kqzakhj4rh6l1a8lw5vw1";
+      };
+    };
+    "@webassemblyjs/ieee754-1.5.12" = {
+      name = "_at_webassemblyjs_slash_ieee754";
+      packageName = "@webassemblyjs/ieee754";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz";
+        sha512 = "1p34jm6p7r6yn32adimw6qjhdir3bvna8chnq7q5gps7d3xjr5ii9l9hx95rvapdcpgmjwjpw963v3f17js5h8j9sszik01sjzw9qqp";
+      };
+    };
+    "@webassemblyjs/leb128-1.5.12" = {
+      name = "_at_webassemblyjs_slash_leb128";
+      packageName = "@webassemblyjs/leb128";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz";
+        sha512 = "09lzncxy6972dcmpmdrmb2grvyv38zkrrp3wxcq43almxmisrsak055asf93imqjkgyrqqg68gz1nadlvqrdmasq616r2a6npyb28vh";
+      };
+    };
+    "@webassemblyjs/utf8-1.5.12" = {
+      name = "_at_webassemblyjs_slash_utf8";
+      packageName = "@webassemblyjs/utf8";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz";
+        sha512 = "32wy1zi742qnzm4a80kvqk8bw2jb09s139p8w8ai2hdp7fbgk3k8larvp4vcamgknnd8ydc88hbvj5ncyav9gzj9ls1ak920dhhszqm";
+      };
+    };
+    "@webassemblyjs/wasm-edit-1.5.12" = {
+      name = "_at_webassemblyjs_slash_wasm-edit";
+      packageName = "@webassemblyjs/wasm-edit";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz";
+        sha512 = "1sqjayps4w4382id6c5l02d65d9pjqz4n318fa0appjasd70f2mwq5xxpb38aby9w5h6aa40pm1gggrwc5jd6439rs9j4dq401ikymg";
+      };
+    };
+    "@webassemblyjs/wasm-gen-1.5.12" = {
+      name = "_at_webassemblyjs_slash_wasm-gen";
+      packageName = "@webassemblyjs/wasm-gen";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz";
+        sha512 = "23dcw8svzg7h274dj4mlfkd2scavic7sk26lvij699wahdmvlj9587s0kw5fy6cswa78kihf5fnazpzl8bml5sji6312isqpmrbwfrd";
+      };
+    };
+    "@webassemblyjs/wasm-opt-1.5.12" = {
+      name = "_at_webassemblyjs_slash_wasm-opt";
+      packageName = "@webassemblyjs/wasm-opt";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz";
+        sha512 = "1yyaib60nv73hs4imhwyjmlr5whnka08b7gvdw6lw7bp67ajakl4i1yiszm8b9jkp1f60bp3ibw4bd50cxwjm86ibpfzxn0lgj0c71c";
+      };
+    };
+    "@webassemblyjs/wasm-parser-1.5.12" = {
+      name = "_at_webassemblyjs_slash_wasm-parser";
+      packageName = "@webassemblyjs/wasm-parser";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz";
+        sha512 = "1akyzn4hsq3vgzrckay26vpy5fglqsaw55sb503w0y0z43yhnyr6kjgi4d2wcpk5b43c1wkm626fq08yd4xy87k25c83dj0xpgsviy6";
+      };
+    };
+    "@webassemblyjs/wast-parser-1.5.12" = {
+      name = "_at_webassemblyjs_slash_wast-parser";
+      packageName = "@webassemblyjs/wast-parser";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz";
+        sha512 = "2z2qbzgba6sp3xnxznvh7ls0bvdpq79n0h00a5m6sgz2wk52r7wjlchiwsyjgg63cklaqfdvf1kkb07irvxqjb9yhgbaqyz3g72sra1";
+      };
+    };
+    "@webassemblyjs/wast-printer-1.5.12" = {
+      name = "_at_webassemblyjs_slash_wast-printer";
+      packageName = "@webassemblyjs/wast-printer";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz";
+        sha512 = "225rq38m20syf9hgmw0mcfx5pgxknjrpw69c99267320cj3byqn07yiqbjagmq4x6yw5c1kp5ylawaqk49bjyjzjzr005i4wx6m2psw";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "@zeit/schemas-1.2.0" = {
@@ -761,6 +1023,8 @@ let
       };
     };
     "ajv-6.5.0" = {
+<<<<<<< HEAD
+=======
       name = "ajv";
       packageName = "ajv";
       version = "6.5.0";
@@ -778,6 +1042,16 @@ let
         sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==";
       };
     };
+    "ajv-6.5.1" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz";
+        sha512 = "34lgq6szzswig3fzq4rwpm4m8gx3bja5rwhxh4w1jx92sbv781vkfndqwz43imalbv1n0apfc5azqpiasv3a2mq1gi70f70bfrnh1m6";
+      };
+    };
     "ajv-keywords-1.5.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
@@ -1180,7 +1454,11 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz";
+<<<<<<< HEAD
         sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==";
+=======
+        sha512 = "15c4c1cdachcnd0fqbxmkj2q293dsicsska3ilnrlds868yqlmkvnjg2vh8kc60b93ka686nikypf94m7zzpg2n2p5z5xp8lglkkcq4";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "archiver-2.1.1" = {
@@ -1867,13 +2145,32 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
+<<<<<<< HEAD
     "aws-sdk-2.265.1" = {
+=======
+<<<<<<< HEAD
+    "aws-sdk-2.252.1" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "aws-sdk";
       packageName = "aws-sdk";
       version = "2.265.1";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.265.1.tgz";
         sha512 = "0xL9Lontx71wxwa+adZQGAWGmsXyrJbJmBzcCd6w+/zRAkd/mGX7T0V4mivPZK3QIiaKR8U/TZDmxAwnOryX3Q==";
+=======
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.252.1.tgz";
+        sha1 = "4ce45b16dc408883e20a564bd86270c67f25bb60";
+=======
+    "aws-sdk-2.254.1" = {
+      name = "aws-sdk";
+      packageName = "aws-sdk";
+      version = "2.254.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.254.1.tgz";
+        sha512 = "3xii67fvbmza2v2asza89vxqkpqv2lksnf95qxpp4fh881kqrrbvxf2pvdmfv1y1ci7za60jabjsfzfvhyrj4f11k8v454qn8mnp25z";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "aws-sign-0.2.0" = {
@@ -2776,13 +3073,32 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
+<<<<<<< HEAD
     "big-integer-1.6.32" = {
+=======
+<<<<<<< HEAD
+    "big-integer-1.6.30" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "big-integer";
       packageName = "big-integer";
       version = "1.6.32";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.32.tgz";
         sha512 = "ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==";
+=======
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.30.tgz";
+        sha512 = "0mpq1fin33p53fjgylmnrc0g51raqmprdpkm51vkl2na7mar5a778mlnwv6wrj98fjcx30wijf0zms9l88ibprn36z39jpw9zpcaq1c";
+=======
+    "big-integer-1.6.31" = {
+      name = "big-integer";
+      packageName = "big-integer";
+      version = "1.6.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.31.tgz";
+        sha512 = "047nkbj5b46cnqrz6rpjcqnzqmrcrk88wc60g74fla91ib7njxbddvm90fv3pfdcwv5pj8jrs7avvvqll6mmjzyijkk5i7hf4sdjdll";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "big.js-3.2.0" = {
@@ -2953,7 +3269,11 @@ let
       version = "2.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.2.tgz";
+<<<<<<< HEAD
         sha512 = "ZphU6H9B0Tf99P2noVmyKkT7Bf8FZG6T3VSurJva8ozvvCqSfLMnI7X4Khxn5qXXvw71/R9Vfq+aJvMgV9lquQ==";
+=======
+        sha512 = "2wnmnap43rjd6mggraizzgm1szxg9g6cwf2my5m4ckv6z4j5ayfz37jvadsrbjlvn9nwr05zw2zni1an9cs39zxykykgla1gzl59636";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -3052,7 +3372,11 @@ let
       version = "1.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.8.tgz";
+<<<<<<< HEAD
         sha512 = "re0AIxakF504MgeMtIyJkVcZ8T5aUxtp/QmTMlmjyb3P44E1BEv5x3LATBGApWAJATyXHtkXRD+gWTmeyYLiQA==";
+=======
+        sha512 = "10f50n9kqwmk81z8hbxj7lp7h0hjq55h08lrh3jqzwln11mh7iwzgf9ldck54q9zmlinlss7vqijmwii66b930768w9s5x42qih1vdd";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "block-stream-0.0.9" = {
@@ -4153,6 +4477,28 @@ let
         sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
       };
     };
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+    "caniuse-lite-1.0.30000850" = {
+      name = "caniuse-lite";
+      packageName = "caniuse-lite";
+      version = "1.0.30000850";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz";
+        sha512 = "109fg3d4qqzsnn1jmrjih7nhddicpkxsyhq60dhx3s6g2rgcfjas5n56h4xfncqq0j3vrbn3w0x35dhlq2cxh4khsfpq8kz8kqvhwl8";
+=======
+    "caniuse-lite-1.0.30000851" = {
+      name = "caniuse-lite";
+      packageName = "caniuse-lite";
+      version = "1.0.30000851";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000851.tgz";
+        sha512 = "22km2mq3dj2lhwfj1rp4ws5iqb6v5x70fpm19sz8d2j1x6awzi2diwg280w1nvpffv6z9ijgyhyj3q7wxyvgg3qpqs0ixqbaw1rqmv3";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      };
+    };
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     "capture-stack-trace-1.0.0" = {
       name = "capture-stack-trace";
       packageName = "capture-stack-trace";
@@ -4510,7 +4856,11 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz";
+<<<<<<< HEAD
         sha512 = "xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==";
+=======
+        sha512 = "3s5s29qg93czdfyvc38m9f688jckv5l1m8gn14734avbf85zgnnikawz336fmhddzvswjaiy9ji0bpz9b3qfzzaialkskf34y1xadn4";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "chromecast-player-0.2.3" = {
@@ -6273,6 +6623,18 @@ let
       name = "cordova-serve";
       packageName = "cordova-serve";
       version = "2.0.1";
+<<<<<<< HEAD
+=======
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz";
+        sha512 = "3v0v93cf8mhli9ai6lzjx7ch43npl08m18i1yx0kaqql23m0s0yf13vbfy4rch9h7rhyjzacjrjwbbbxizjlflcwrc0k2djjw7payfx";
+      };
+    };
+    "core-js-1.2.7" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "1.2.7";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       src = fetchurl {
         url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz";
         sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g==";
@@ -6419,7 +6781,11 @@ let
       version = "3.32.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.0.tgz";
+<<<<<<< HEAD
         sha512 = "l9chXj5LLyVFfPF6nFCWlm5/Wt+04d+mXUpG5LJAogeyRruWfjnUozfmQspAi6iW91ibp7qKBuFMPJViz5lp1Q==";
+=======
+        sha512 = "3ank6fgcaakqk710s5bm9wvb3vrda4b83545riplga3jzlnpd3b41x282rf8ijabnkdzqdlvxd7yvlnjr89qypigi2jabsb7rg23mwp";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "cron-1.3.0" = {
@@ -6653,7 +7019,11 @@ let
       version = "1.0.0-alpha.29";
       src = fetchurl {
         url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz";
+<<<<<<< HEAD
         sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==";
+=======
+        sha512 = "298cwd6d7z5l9b2k18v40301gb0qp4rap4hhmk53003xpfdzi25176qr7dqlmp2mzgvzsm3c0hbqv66fqhfl8p742ylbhlxgkamn4xi";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "css-tree-1.0.0-alpha25" = {
@@ -6698,7 +7068,11 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz";
+<<<<<<< HEAD
         sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==";
+=======
+        sha512 = "217qxljfrvizjhkp4yr7wp6zbajd7kmbwwcll8xmjw10g695v84hmrjy5l6ik8m8ykgi4fzv558vcv1hbv2dpfjv984sqfznwn99fmy";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "cssom-0.3.3" = {
@@ -8958,7 +9332,11 @@ let
       version = "1.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz";
+<<<<<<< HEAD
         sha512 = "fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==";
+=======
+        sha512 = "3d3clp90lbj291d6za5sbk39pklbcvalpyq6s93l105dcyrmnhaahzppkjxlhmaqwrq8hz1v2vzv0ska39jk23bvpvcp1p8r1zhwdby";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "escodegen-1.8.1" = {
@@ -12811,7 +13189,11 @@ let
       version = "1.1.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
+<<<<<<< HEAD
         sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
+=======
+        sha512 = "0nf551idk1p8slbvd2jvzdh9hkm5z2dpv0b3jh1wgkab3mbi33vimdwiivrymvaqk7ba3by6rg9bn5xsdiqi24cn9vr5yjq6kw8y2qs";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "ieee754-1.1.8" = {
@@ -14530,7 +14912,11 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+<<<<<<< HEAD
         sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+=======
+        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "json-stable-stringify-0.0.1" = {
@@ -18715,13 +19101,32 @@ let
         sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ==";
       };
     };
+<<<<<<< HEAD
     "node-red-node-twitter-1.0.1" = {
+=======
+<<<<<<< HEAD
+    "node-red-node-twitter-0.1.15" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
       version = "1.0.1";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz";
         sha512 = "NAM6mlAiZk1EwHtdPNnP/E8P5EIijnqSag1vzE/Ya+ggywTiELt9HtYX26evyB/MrnVS+FIJg+M8S5HobklERg==";
+=======
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.15.tgz";
+        sha512 = "07v6lmlyb0hdg9l86gvlipvs3ahi64fgswkadz1frczpi293hydlbdsy7rb917nf7z0kpcsrnch9d92xwirf4p6yzfhkmdsanrb9ha0";
+=======
+    "node-red-node-twitter-1.0.1" = {
+      name = "node-red-node-twitter";
+      packageName = "node-red-node-twitter";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz";
+        sha512 = "1348jbfx28lng73hc4m5y2jfnpcq7y8mykxn5yn3ryvn4720k5j1s3bv17wqvqdda97m3i28bj0ykzwrzckqpbvq124sri2a2d3l0rl";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "node-ssdp-2.9.1" = {
@@ -19219,6 +19624,7 @@ let
         sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
+<<<<<<< HEAD
     "numeral-2.0.6" = {
       name = "numeral";
       packageName = "numeral";
@@ -19228,13 +19634,29 @@ let
         sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506";
       };
     };
+=======
+<<<<<<< HEAD
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     "nwmatcher-1.4.4" = {
       name = "nwmatcher";
       packageName = "nwmatcher";
       version = "1.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz";
+<<<<<<< HEAD
         sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==";
+=======
+        sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy";
+=======
+    "numeral-2.0.6" = {
+      name = "numeral";
+      packageName = "numeral";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz";
+        sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "oauth-0.9.14" = {
@@ -22254,13 +22676,32 @@ let
         sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
       };
     };
+<<<<<<< HEAD
     "raw-socket-1.6.2" = {
+=======
+<<<<<<< HEAD
+    "raw-socket-1.6.1" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "raw-socket";
       packageName = "raw-socket";
       version = "1.6.2";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz";
         sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw==";
+=======
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.1.tgz";
+        sha512 = "0fhy1r7pyl4v2zmjz1fmvqbdmjscib47pbc5di3cn965j7zj3y5h2bs8x0r131i4s7xj47c36na1cgpppp71kvdc1qs78y4bf7fpa45";
+=======
+    "raw-socket-1.6.2" = {
+      name = "raw-socket";
+      packageName = "raw-socket";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz";
+        sha512 = "1ry9bwkiw9qpdhqrs5si04p79ijg9zicfqvin3igh3as13lxvhm8bc0l3gnn0cyyirlgzhrvbcsirlpxi1cgjpx4sr8yd65fc0qvf95";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "rc-0.4.0" = {
@@ -24225,13 +24666,32 @@ let
         sha512 = "dU3TBVIGkP5Hzw6o74hJx+VzTBTX2rqIiLfugs0HdmdVQCQp76XGg2jlBCqfRJfW/n6/mUKTi+s3rnzX7SgbBA==";
       };
     };
+<<<<<<< HEAD
     "simple-git-1.96.0" = {
+=======
+<<<<<<< HEAD
+    "simple-git-1.95.1" = {
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       name = "simple-git";
       packageName = "simple-git";
       version = "1.96.0";
       src = fetchurl {
+<<<<<<< HEAD
         url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
         sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
+=======
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.95.1.tgz";
+        sha512 = "3ssfxzdgj6ycrklss1hxrmwcfsncx9bccnsxrkdknw68p2g9is3j3dc2kk748jn0kky9q7ajdjqvv6k18n6qbj9llaiy5kh9k1i7mbj";
+=======
+    "simple-git-1.96.0" = {
+      name = "simple-git";
+      packageName = "simple-git";
+      version = "1.96.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
+        sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -25608,7 +26068,11 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.1.tgz";
+<<<<<<< HEAD
         sha512 = "aRy4neA4rf+qMtLT9fCRLPGWdrsIKtCx4kUdNTIPgPQ2hkHkdxbViVAvABMx9oRM6yCWfngHx6pwXfbYkVuPuw==";
+=======
+        sha512 = "2xqynwiv3v5sw5aqw3phzln43mlr17n649h0bshi7aicxz48633dx401wr3a7a5waqx0ah8pdv9dw9cj7qgblyj6amgzb9qw2fvh739";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "stream-to-blob-url-2.1.1" = {
@@ -25617,7 +26081,11 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.1.tgz";
+<<<<<<< HEAD
         sha512 = "DKJPEmCmIZoBfGVle9IhSfERiWaN5cuOtmfPxP2dZbLDRZxkBWZ4QbYxEJOSALk1Kf+WjBgedAMO6qkkf7Lmrg==";
+=======
+        sha512 = "2pfdckz4jlyl3h3fhg1i34nzwlkbf80ja9i0cdn85w6c1b4ki2w7ck5kpyw9kv7ns7cprcdcs4i3wa94797nrb5gh0rl8d6c094z8hc";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "stream-to-promise-2.2.0" = {
@@ -25662,7 +26130,11 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.2.tgz";
+<<<<<<< HEAD
         sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg==";
+=======
+        sha512 = "372mnjvz0khis4a797qk4zwfwacb0fq726806jzi4cc4kncy97hcj8f4h68whid774a8wi803gdq22wg2ksnp9ncggyp0k67i58h52k";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "streamline-0.10.17" = {
@@ -26187,6 +26659,7 @@ let
         sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==";
       };
     };
+<<<<<<< HEAD
     "supports-color-5.1.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -26196,6 +26669,8 @@ let
         sha512 = "Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==";
       };
     };
+=======
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -26950,7 +27425,11 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.2.tgz";
+<<<<<<< HEAD
         sha512 = "ElXPyXKKG73o+uziHJ8qlYE9EuyDVxnK2zWL+pW/2bma7RsLpSwFFIJAb8Qui7/tel2hsHQW1z3zBnfQNREpWA==";
+=======
+        sha512 = "1c2j49ms1vhdwrxswb79c51bmxfvgwb5v26yh422h2jr98b3gnrmffrpyazm2rmvg51jmw3xh93v0cm5agirqpczblbs6wafb4wym8j";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "torrent-stream-1.0.4" = {
@@ -27043,6 +27522,7 @@ let
         sha512 = "WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg==";
       };
     };
+<<<<<<< HEAD
     "tr46-0.0.3" = {
       name = "tr46";
       packageName = "tr46";
@@ -27052,6 +27532,8 @@ let
         sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a";
       };
     };
+=======
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     "tr46-1.0.1" = {
       name = "tr46";
       packageName = "tr46";
@@ -28237,7 +28719,11 @@ let
       version = "3.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz";
+<<<<<<< HEAD
         sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA==";
+=======
+        sha512 = "0f5akhzfv94vmq1m8yix1cw1gqk70f11r481vf62571pjlc2rycp2dircj5i7sv4f5xqfci87lxla1vmw686xarf0n37r3w8vm4lnry";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "ut_pex-1.2.1" = {
@@ -28951,6 +29437,7 @@ let
         sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       };
     };
+<<<<<<< HEAD
     "webidl-conversions-2.0.1" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -28960,6 +29447,8 @@ let
         sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506";
       };
     };
+=======
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     "webidl-conversions-4.0.2" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -29027,6 +29516,7 @@ let
       name = "whatwg-url";
       packageName = "whatwg-url";
       version = "6.4.1";
+<<<<<<< HEAD
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz";
         sha512 = "FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw==";
@@ -29039,6 +29529,11 @@ let
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz";
         sha1 = "00898111af689bb097541cd5a45ca6c8798445bf";
+=======
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz";
+        sha512 = "27rkflmrkzbamg28yflyisk49jl2dnvmk4651sn7hhig2rsahxj4c5ld3ljx9mjps0f6zqv0yvwl7d37w817vkmx7qnxiqp3frs030p";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       };
     };
     "when-3.4.6" = {
@@ -30422,7 +30917,20 @@ in
       sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
     };
     dependencies = [
+<<<<<<< HEAD
       sources."@types/node-8.10.20"
+=======
+      sources."@types/caseless-0.12.1"
+      sources."@types/form-data-2.2.1"
+<<<<<<< HEAD
+      sources."@types/node-8.10.18"
+=======
+      sources."@types/node-8.10.19"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      sources."@types/request-2.47.0"
+      sources."@types/tough-cookie-2.3.3"
+      sources."@types/uuid-3.4.3"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
       sources."ajv-5.5.2"
@@ -30699,6 +31207,14 @@ in
       })
       (sources."ms-rest-azure-2.5.7" // {
         dependencies = [
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+          sources."@types/node-9.6.20"
+=======
+          sources."@types/node-9.6.21"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
           sources."async-2.6.0"
         ];
       })
@@ -31182,6 +31698,7 @@ in
       sources."base64-js-1.3.0"
       sources."bencode-2.0.0"
       sources."bitfield-0.1.0"
+<<<<<<< HEAD
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
           sources."bencode-0.7.0"
@@ -31192,6 +31709,10 @@ in
           sources."bencode-0.8.0"
         ];
       })
+=======
+      sources."bittorrent-dht-6.4.2"
+      sources."bittorrent-tracker-7.7.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."blob-to-buffer-1.2.8"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
@@ -31482,7 +32003,15 @@ in
       sources."through-2.3.8"
       sources."thunky-0.1.0"
       sources."time-line-1.0.1"
+<<<<<<< HEAD
       sources."torrent-discovery-5.4.0"
+=======
+      (sources."torrent-discovery-5.4.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."torrent-piece-1.1.2"
       (sources."torrent-stream-1.0.4" // {
         dependencies = [
@@ -31690,7 +32219,15 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.1"
+<<<<<<< HEAD
       sources."big-integer-1.6.32"
+=======
+<<<<<<< HEAD
+      sources."big-integer-1.6.30"
+=======
+      sources."big-integer-1.6.31"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
       sources."body-parser-1.18.2"
@@ -31788,7 +32325,15 @@ in
         ];
       })
       sources."cordova-registry-mapper-1.1.15"
+<<<<<<< HEAD
       sources."cordova-serve-2.0.1"
+=======
+      (sources."cordova-serve-2.0.1" // {
+        dependencies = [
+          sources."shelljs-0.5.3"
+        ];
+      })
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -33114,7 +33659,15 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
+<<<<<<< HEAD
       sources."aws-sdk-2.265.1"
+=======
+<<<<<<< HEAD
+      sources."aws-sdk-2.252.1"
+=======
+      sources."aws-sdk-2.254.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."base64-js-1.3.0"
@@ -34438,7 +34991,15 @@ in
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.0.0"
+<<<<<<< HEAD
+      sources."simple-git-1.96.0"
+=======
+<<<<<<< HEAD
+      sources."simple-git-1.95.1"
+=======
       sources."simple-git-1.96.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -35613,10 +36174,24 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
+<<<<<<< HEAD
     version = "2.10.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz";
       sha512 = "y8IOlo8Ml/CFuvr8pFdaMpNV43W5eZhTl5UZuRxKGxX08PSi3OZsYjr5gMYsKT5ZzMNk/U+MqZXJNh6Ccm30hQ==";
+=======
+<<<<<<< HEAD
+    version = "2.9.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.2.tgz";
+      sha512 = "01pqqc94lq3c9010wbb0zafs81b5z4mzr06864kf4vs3zih30xfral4rbk9d2q2m2kbawcym8zlj5xydgig5k40kzqy1hyhallcm5dm";
+=======
+    version = "2.9.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.3.tgz";
+      sha512 = "0f3mqalx44w1zfhy6vl299rp18mg4s35gass533sgw7hr7dcf6vzwy3dcik1ncl0xss1bbs4vi7a3mbxhrddm7pd2r36hmpgnp29hn5";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."ansi-color-0.2.1"
@@ -35978,10 +36553,24 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
+<<<<<<< HEAD
     version = "0.14.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz";
       sha512 = "8RVRAb1TO6LlCny6+8GC+sXDsESYv7gv7fSLdVANklVt866I416/7Z5fdqrtzSru92nyreddgavbEk8pjqcWoA==";
+=======
+<<<<<<< HEAD
+    version = "0.13.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.13.0.tgz";
+      sha512 = "0lz3n3y62gvdiqazgqbpfb9pdxwjvrjaagzs46ihsl6h6k18d7qmcw6bxiv30jkm3b6alb6p0l48jrym12sksx23am9bmibx45jwiq2";
+=======
+    version = "0.14.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz";
+      sha512 = "2h1d9wf557i5nxbh5fygbgjd7vywandxnm7cpwyxnzmxqw8mvrnsmcj1m87b2zlxlpvigwq8jqc7igshb0zpfkw1bjs4fskpl0m25gi";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -37900,6 +38489,345 @@ in
     production = true;
     bypassCache = false;
   };
+<<<<<<< HEAD
+=======
+  lcov-result-merger = nodeEnv.buildNodePackage {
+    name = "lcov-result-merger";
+    packageName = "lcov-result-merger";
+    version = "3.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz";
+      sha512 = "2l5nw2y7yblpyp45q06dwd1yhrd5np1q1nxm27lx7kjdjrdscry6qp5rsm04v9ccsa31ccmdl9mx4vmrp95zmbbij6p4bdbfvqzv1p9";
+    };
+    dependencies = [
+      sources."append-buffer-1.0.2"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-equal-1.0.0"
+      sources."clone-2.1.2"
+      sources."clone-buffer-1.0.0"
+      sources."clone-stats-1.0.0"
+      sources."cloneable-readable-1.1.2"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.5.1"
+      sources."core-util-is-1.0.2"
+      sources."define-properties-1.1.2"
+      sources."duplexify-3.6.0"
+      sources."end-of-stream-1.4.1"
+      sources."extend-3.0.1"
+      sources."flush-write-stream-1.0.3"
+      sources."foreach-2.0.5"
+      sources."fs-mkdirp-stream-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."glob-7.1.2"
+      sources."glob-parent-3.1.0"
+      sources."glob-stream-6.1.0"
+      sources."graceful-fs-4.1.11"
+      sources."has-symbols-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-absolute-1.0.0"
+      sources."is-buffer-1.1.6"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-3.1.0"
+      sources."is-negated-glob-1.0.0"
+      sources."is-relative-1.0.0"
+      sources."is-unc-path-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."is-valid-glob-1.0.0"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."lazystream-1.0.0"
+      sources."lead-1.0.0"
+      sources."minimatch-3.0.4"
+      sources."normalize-path-2.1.1"
+      sources."now-and-later-2.0.0"
+      sources."object-keys-1.0.11"
+      sources."object.assign-4.1.0"
+      sources."once-1.4.0"
+      sources."ordered-read-streams-1.0.1"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."pump-2.0.1"
+      sources."pumpify-1.5.1"
+      sources."readable-stream-2.3.6"
+      sources."remove-bom-buffer-3.0.0"
+      sources."remove-bom-stream-1.2.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."replace-ext-1.0.0"
+      sources."resolve-options-1.1.0"
+      sources."safe-buffer-5.1.2"
+      sources."stream-shift-1.0.0"
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.3"
+      sources."through2-filter-2.0.0"
+      sources."to-absolute-glob-2.0.2"
+      sources."to-through-2.0.0"
+      sources."unc-path-regex-0.1.2"
+      sources."unique-stream-2.2.1"
+      sources."util-deprecate-1.0.2"
+      sources."value-or-function-3.0.0"
+      sources."vinyl-2.1.0"
+      sources."vinyl-fs-3.0.3"
+      sources."vinyl-sourcemap-1.1.0"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Merges multiple lcov results into one";
+      homepage = https://github.com/mweibel/lcov-result-merger;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  livedown = nodeEnv.buildNodePackage {
+    name = "livedown";
+    packageName = "livedown";
+    version = "2.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz";
+      sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b";
+    };
+    dependencies = [
+      sources."accepts-1.3.5"
+      sources."after-0.8.2"
+      sources."ajv-5.5.2"
+      sources."anymatch-1.3.2"
+      sources."argparse-1.0.10"
+      sources."arr-diff-2.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."array-flatten-1.1.1"
+      sources."array-unique-0.2.1"
+      sources."arraybuffer.slice-0.0.7"
+      sources."asn1-0.2.3"
+      sources."assert-plus-1.0.0"
+      sources."async-each-1.0.1"
+      sources."async-limiter-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."backo2-1.0.2"
+      sources."balanced-match-1.0.0"
+      sources."base64-arraybuffer-0.1.5"
+      sources."base64id-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."better-assert-1.0.2"
+      sources."binary-extensions-1.11.0"
+      sources."blob-0.0.4"
+      sources."body-parser-1.18.3"
+      sources."brace-expansion-1.1.11"
+      (sources."braces-1.8.5" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."bytes-3.0.0"
+      sources."callsite-1.0.0"
+      sources."caseless-0.12.0"
+      sources."chokidar-1.7.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      sources."component-inherit-0.0.3"
+      sources."concat-map-0.0.1"
+      sources."content-disposition-0.5.2"
+      sources."content-type-1.0.4"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."ecc-jsbn-0.1.1"
+      sources."ee-first-1.1.1"
+      sources."emoji-regex-6.1.1"
+      sources."encodeurl-1.0.2"
+      sources."engine.io-3.2.0"
+      sources."engine.io-client-3.2.1"
+      sources."engine.io-parser-2.1.2"
+      sources."entities-1.1.1"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      sources."expand-brackets-0.1.5"
+      sources."expand-range-1.8.2"
+      (sources."express-4.16.3" // {
+        dependencies = [
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
+          sources."safe-buffer-5.1.1"
+          sources."statuses-1.4.0"
+        ];
+      })
+      sources."extend-3.0.1"
+      sources."extglob-0.3.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."filename-regex-2.0.1"
+      sources."fill-range-2.2.4"
+      sources."finalhandler-1.1.1"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."fsevents-1.2.4"
+      sources."getpass-0.1.7"
+      sources."github-slugger-1.2.0"
+      sources."glob-base-0.3.0"
+      sources."glob-parent-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."has-binary2-1.0.3"
+      sources."has-cors-1.1.0"
+      sources."html-entities-1.2.1"
+      sources."http-errors-1.6.3"
+      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.23"
+      sources."indexof-0.0.1"
+      sources."inherits-2.0.3"
+      sources."innertext-1.0.3"
+      sources."ipaddr.js-1.6.0"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-1.0.0"
+      sources."is-glob-2.0.1"
+      sources."is-number-2.1.0"
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-wsl-1.1.0"
+      sources."isarray-1.0.0"
+      sources."isobject-2.1.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."kind-of-3.2.2"
+      sources."linkify-it-2.0.3"
+      sources."markdown-it-8.4.1"
+      sources."markdown-it-emoji-1.4.0"
+      sources."markdown-it-github-headings-1.1.1"
+      sources."markdown-it-task-checkbox-1.0.6"
+      sources."math-random-1.0.1"
+      sources."mdurl-1.0.1"
+      sources."media-typer-0.3.0"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."micromatch-2.3.11"
+      sources."mime-1.4.1"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."ms-2.0.0"
+      sources."nan-2.10.0"
+      sources."negotiator-0.6.1"
+      sources."normalize-path-2.1.1"
+      sources."oauth-sign-0.8.2"
+      sources."object-component-0.0.3"
+      sources."object.omit-2.0.1"
+      sources."on-finished-2.3.0"
+      sources."opn-5.3.0"
+      sources."parse-glob-3.0.4"
+      sources."parseqs-0.0.5"
+      sources."parseuri-0.0.5"
+      sources."parseurl-1.3.2"
+      sources."path-is-absolute-1.0.1"
+      sources."path-to-regexp-0.1.7"
+      sources."performance-now-2.1.0"
+      sources."preserve-0.2.0"
+      sources."process-nextick-args-2.0.0"
+      sources."proxy-addr-2.0.3"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      (sources."randomatic-3.0.0" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+        ];
+      })
+      sources."range-parser-1.2.0"
+      sources."raw-body-2.3.3"
+      sources."readable-stream-2.3.6"
+      sources."readdirp-2.1.0"
+      sources."regex-cache-0.4.4"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."request-2.87.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
+      sources."set-immediate-shim-1.0.1"
+      sources."setprototypeof-1.1.0"
+      (sources."socket.io-2.1.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."isarray-2.0.1"
+        ];
+      })
+      sources."socket.io-adapter-1.1.1"
+      sources."socket.io-client-2.1.1"
+      sources."socket.io-parser-3.2.0"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.14.2"
+      sources."statuses-1.5.0"
+      sources."string_decoder-1.1.1"
+      sources."to-array-0.1.4"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-is-1.6.16"
+      sources."uc.micro-1.0.5"
+      sources."ultron-1.1.1"
+      sources."unpipe-1.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-3.2.1"
+      sources."vary-1.1.2"
+      sources."verror-1.10.0"
+      sources."ws-3.3.3"
+      sources."xmlhttprequest-ssl-1.5.5"
+      sources."yeast-0.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Live Markdown previews for your favourite editor.";
+      homepage = https://github.com/shime/livedown;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
   live-server = nodeEnv.buildNodePackage {
     name = "live-server";
     packageName = "live-server";
@@ -38363,10 +39291,17 @@ in
   meguca = nodeEnv.buildNodePackage {
     name = "meguca";
     packageName = "meguca";
+<<<<<<< HEAD
     version = "1.0.8";
     src = fetchurl {
       url = "https://registry.npmjs.org/meguca/-/meguca-1.0.8.tgz";
       sha512 = "6hEfEe5385DL95w4YPo68Y/DzSGo7vyw9/ckHsAMk/qO+GBcbI1pGRVkx0oJQtTdJ7mGSVc+gcVj09sj9auTQg==";
+=======
+    version = "1.0.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/meguca/-/meguca-1.0.5.tgz";
+      sha512 = "0lilvxbsrwlmavh8g991m709w8p58h6rcq63izh7l6lsindvbq2w5lrk19ifb8ynqycfyhc7kh67yvkfw42p44i48skk316vjz9k8ry";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
@@ -38444,6 +39379,14 @@ in
       sources."buffer-equal-1.0.0"
       sources."cache-base-1.0.1"
       sources."camelcase-1.2.1"
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+      sources."caniuse-lite-1.0.30000850"
+=======
+      sources."caniuse-lite-1.0.30000851"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-1.1.3"
@@ -39368,7 +40311,11 @@ in
     version = "3.7.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz";
+<<<<<<< HEAD
       sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==";
+=======
+      sha512 = "1pf02189vfiqj2qqm8ihvb9fwa2j32c3xj1hifv5njlasm24rrxjw4yj2ynqpyal2jmdj3v0n3rbpyj0f5wfw4qrvx77ibxbgy08d58";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -39384,7 +40331,14 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."block-stream-0.0.9"
+<<<<<<< HEAD
+      sources."boom-2.10.1"
+=======
+<<<<<<< HEAD
+=======
       sources."boom-2.10.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
@@ -39393,12 +40347,20 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
+<<<<<<< HEAD
       sources."cryptiles-2.0.5"
       (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
       })
+=======
+<<<<<<< HEAD
+=======
+      sources."cryptiles-2.0.5"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      sources."dashdash-1.14.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."ecc-jsbn-0.1.1"
@@ -39419,9 +40381,19 @@ in
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
       sources."has-unicode-2.0.1"
+<<<<<<< HEAD
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."http-signature-1.1.1"
+=======
+<<<<<<< HEAD
+      sources."http-signature-1.2.0"
+=======
       sources."hawk-3.1.3"
       sources."hoek-2.16.3"
       sources."http-signature-1.1.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."is-fullwidth-code-point-1.0.0"
@@ -39459,19 +40431,37 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.4.0"
       sources."readable-stream-2.3.6"
+<<<<<<< HEAD
       sources."request-2.81.0"
+=======
+<<<<<<< HEAD
+      sources."request-2.87.0"
+=======
+      sources."request-2.81.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+      sources."sshpk-1.14.2"
+=======
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."sntp-1.0.9"
       (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
       })
+<<<<<<< HEAD
+=======
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.6"
@@ -39544,8 +40534,21 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.1"
+<<<<<<< HEAD
       sources."biased-opener-0.2.8"
       sources."big-integer-1.6.32"
+=======
+      (sources."biased-opener-0.2.8" // {
+        dependencies = [
+          sources."yargs-1.3.3"
+        ];
+      })
+<<<<<<< HEAD
+      sources."big-integer-1.6.30"
+=======
+      sources."big-integer-1.6.31"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."block-stream-0.0.9"
       sources."body-parser-1.18.2"
       sources."boom-2.10.1"
@@ -40536,6 +41539,23 @@ in
           sources."clone-1.0.4"
         ];
       })
+<<<<<<< HEAD
+=======
+      (sources."node-red-node-feedparser-0.1.12" // {
+        dependencies = [
+          sources."addressparser-1.0.1"
+        ];
+      })
+      sources."node-red-node-rbe-0.2.3"
+<<<<<<< HEAD
+      sources."node-red-node-twitter-0.1.15"
+=======
+      sources."node-red-node-twitter-1.0.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      sources."nodemailer-1.11.0"
+      sources."nodemailer-direct-transport-1.1.0"
+      sources."nodemailer-smtp-transport-1.1.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."nodemailer-wellknown-0.1.10"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
@@ -40768,11 +41788,19 @@ in
       sources."qs-0.5.1"
       sources."rai-0.1.12"
       sources."range-parser-0.0.4"
+<<<<<<< HEAD
       (sources."raw-socket-1.6.2" // {
         dependencies = [
           sources."nan-2.10.0"
         ];
       })
+=======
+<<<<<<< HEAD
+      sources."raw-socket-1.6.1"
+=======
+      sources."raw-socket-1.6.2"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."redis-0.7.3"
       sources."semver-1.1.0"
       sources."send-0.1.0"
@@ -41660,7 +42688,11 @@ in
     version = "0.39.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/peerflix/-/peerflix-0.39.0.tgz";
+<<<<<<< HEAD
       sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA==";
+=======
+      sha512 = "1cgwwjdnd7rahydc7fyhhgfh63z0b8cx5q8b9m4q5hv7ca235zrzbf3f9d3d8s3cyr0qazzg9yz2r4xx731p5ppf14wyx4pw47px45j";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -41679,6 +42711,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
+<<<<<<< HEAD
       sources."big-integer-1.6.32"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
@@ -41691,6 +42724,16 @@ in
           sources."bencode-0.8.0"
         ];
       })
+=======
+<<<<<<< HEAD
+      sources."big-integer-1.6.30"
+=======
+      sources."big-integer-1.6.31"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      sources."bitfield-0.1.0"
+      sources."bittorrent-dht-6.4.2"
+      sources."bittorrent-tracker-7.7.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."blob-to-buffer-1.2.8"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
@@ -41714,8 +42757,13 @@ in
       sources."cli-width-2.2.0"
       sources."clivas-0.2.0"
       sources."code-point-at-1.1.0"
+<<<<<<< HEAD
       sources."color-convert-1.9.2"
       sources."color-name-1.1.1"
+=======
+      sources."color-convert-1.9.1"
+      sources."color-name-1.1.3"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -41855,6 +42903,7 @@ in
       sources."plist-1.2.0"
       sources."process-nextick-args-2.0.0"
       sources."pump-2.0.1"
+<<<<<<< HEAD
       (sources."random-access-file-2.0.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -41862,6 +42911,10 @@ in
         ];
       })
       sources."random-access-storage-1.3.0"
+=======
+      sources."random-access-file-2.0.1"
+      sources."random-access-storage-1.2.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
@@ -41915,7 +42968,19 @@ in
       sources."through-2.3.8"
       sources."thunky-1.0.2"
       sources."tmp-0.0.33"
+<<<<<<< HEAD
       sources."torrent-discovery-5.4.0"
+=======
+      (sources."torrent-discovery-5.4.0" // {
+        dependencies = [
+          sources."bencode-0.8.0"
+          sources."isarray-1.0.0"
+          sources."minimist-1.2.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."torrent-piece-1.1.2"
       (sources."torrent-stream-1.0.4" // {
         dependencies = [
@@ -42470,10 +43535,24 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
+<<<<<<< HEAD
     version = "1.13.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz";
       sha512 = "KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==";
+=======
+<<<<<<< HEAD
+    version = "1.13.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.13.4.tgz";
+      sha512 = "325wxdf3kzhwx8wnfz13gnllivgbgsbwqfqmq3pv29gamzzwspajfjwz7iw83fxlzf3nyd038h4qv9y544v5b5fjvsh52n0crkh8svs";
+=======
+    version = "1.13.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.13.5.tgz";
+      sha512 = "1zp1phxpbbli50hpbka36wdqkhl4sz765zxb1xzkgmkmfmh1vpbbwcm91pllv4q633wj8v4iipkm09wn7gwvqb0gy8srkybzfcp9kz0";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -42490,7 +43569,11 @@ in
     version = "12.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/pulp/-/pulp-12.3.0.tgz";
+<<<<<<< HEAD
       sha512 = "Sm1XQg2h2JBVHWK3bxSHnmMdMoM0hEi5cbGfBBLpM6E2qU1vjJhDJsO/8bEkxC2RvNAAEOWROKMI3tTzmVxLbQ==";
+=======
+      sha512 = "1nlnp4rygadw253728ya400s2y92bf44jqz3gy34r1ri33g9nlkd89kx49097xif6wli11lhcr1sqwyhwa6zdv23mar1n511m15fvaa";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."JSONStream-1.3.3"
@@ -43536,10 +44619,24 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
+<<<<<<< HEAD
     version = "9.1.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz";
       sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw==";
+=======
+<<<<<<< HEAD
+    version = "8.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/serve/-/serve-8.1.1.tgz";
+      sha512 = "33362hcr3ya4yadf2vzck9w8ihh58g025y2ngrj7c461h2jbazi1ddrp4qi8d82y5781rkrihahas2y3pcskipx75n2mghs2mhs98dx";
+=======
+    version = "8.1.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/serve/-/serve-8.1.2.tgz";
+      sha512 = "1n065fkglc79qiaj96c6aiz3rcmc8fw6vv58xpq4fw8k4cawyzpryhmpxa5433j2b0ska9jw66z4rpcbf8nq633y04wsg7xf01fzvm1";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."@zeit/schemas-1.2.0"
@@ -45016,10 +46113,24 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
+<<<<<<< HEAD
     version = "1.4.26";
     src = fetchurl {
       url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz";
       sha512 = "hA1Sr7zi6v+RhcJVC4cOySorCh21+Xdw627ewEkLlRXIWVjUnwdj8cEr0gj6apL7E+lqso3NwhZS/GliMyeL2g==";
+=======
+<<<<<<< HEAD
+    version = "1.4.24";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.24.tgz";
+      sha512 = "1lx5m5bkm4m64qiy8ccnbixchng112m2b9qvzd963k8f0nb298hfjrry1c2la1bavv834zdvgv2xwa93fdyaq0wrv562p9d0n1p5lxy";
+=======
+    version = "1.4.25";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.25.tgz";
+      sha512 = "2f8fb42a03zpqd715d09k2g39zwb8xwq7qjh6zrw543kn3g66mq0s8civhv9b4frai8phpqdxlhyd7dbvw4ykhbyfmfq3x220svvvxf";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -45922,12 +47033,45 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
+<<<<<<< HEAD
     version = "4.13.0";
+=======
+<<<<<<< HEAD
+    version = "4.11.1";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     src = fetchurl {
       url = "https://registry.npmjs.org/webpack/-/webpack-4.13.0.tgz";
       sha512 = "3KMX0uPjJ4cXjl9V/AY+goRQPs7jtKRQn3hhNOG6s8Sx3mmGCQUjQJvjVoGNABVo5svgujIcSLBN8g62EzqIMA==";
     };
     dependencies = [
+<<<<<<< HEAD
+=======
+      sources."@webassemblyjs/ast-1.5.10"
+      sources."@webassemblyjs/floating-point-hex-parser-1.5.10"
+      sources."@webassemblyjs/helper-api-error-1.5.10"
+      sources."@webassemblyjs/helper-buffer-1.5.10"
+      sources."@webassemblyjs/helper-code-frame-1.5.10"
+      sources."@webassemblyjs/helper-fsm-1.5.10"
+      sources."@webassemblyjs/helper-module-context-1.5.10"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.5.10"
+      sources."@webassemblyjs/helper-wasm-section-1.5.10"
+      sources."@webassemblyjs/ieee754-1.5.10"
+      sources."@webassemblyjs/leb128-1.5.10"
+      sources."@webassemblyjs/utf8-1.5.10"
+      sources."@webassemblyjs/wasm-edit-1.5.10"
+      sources."@webassemblyjs/wasm-gen-1.5.10"
+      sources."@webassemblyjs/wasm-opt-1.5.10"
+      sources."@webassemblyjs/wasm-parser-1.5.10"
+      sources."@webassemblyjs/wast-parser-1.5.10"
+      sources."@webassemblyjs/wast-printer-1.5.10"
+=======
+    version = "4.12.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.12.0.tgz";
+      sha512 = "0krki7h1xk4hrlwkqnsb0cqd8ah1qlgmcippf0w3wxg3brqx5dzm2xw96y3fix89mphbcbg5z346nkilpdnijcndk9kmdk0z0azd60h";
+    };
+    dependencies = [
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."@webassemblyjs/ast-1.5.12"
       sources."@webassemblyjs/floating-point-hex-parser-1.5.12"
       sources."@webassemblyjs/helper-api-error-1.5.12"
@@ -45946,7 +47090,12 @@ in
       sources."@webassemblyjs/wasm-parser-1.5.12"
       sources."@webassemblyjs/wast-parser-1.5.12"
       sources."@webassemblyjs/wast-printer-1.5.12"
+<<<<<<< HEAD
       sources."acorn-5.7.1"
+=======
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+      sources."acorn-5.6.2"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."acorn-dynamic-import-3.0.0"
       sources."ajv-6.5.1"
       sources."ajv-keywords-3.2.0"
@@ -46139,7 +47288,15 @@ in
       sources."isarray-1.0.0"
       sources."isobject-3.0.1"
       sources."json-parse-better-errors-1.0.2"
+<<<<<<< HEAD
+      sources."json-schema-traverse-0.4.1"
+=======
+<<<<<<< HEAD
+      sources."json-schema-traverse-0.3.1"
+=======
       sources."json-schema-traverse-0.4.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."json5-0.5.1"
       sources."kind-of-6.0.2"
       sources."leb-0.3.0"
@@ -46315,7 +47472,11 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
+<<<<<<< HEAD
       sources."tslib-1.9.3"
+=======
+      sources."tslib-1.9.2"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
       (sources."uglify-es-3.3.10" // {
@@ -46385,7 +47546,11 @@ in
     version = "1.12.3";
     src = fetchurl {
       url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.3.tgz";
+<<<<<<< HEAD
       sha512 = "NnBAGkD64CRsl9edM9q0QU+ku6nCX32nM0U+YC8Gs/36c8y+5m9Tya3mWIux3oZKZ54yGiVtnok4tUpqDE5tMA==";
+=======
+      sha512 = "0q6skhcd95baf49krnja6ijkrklm1nyn65mirmdr59nzrmyrirzmzdk0qpn0gj56fkpspy2m6xs8ks1nkd377fpjxn29q7s80d40w1n";
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -46406,6 +47571,7 @@ in
         ];
       })
       sources."bittorrent-peerid-1.2.0"
+<<<<<<< HEAD
       (sources."bittorrent-protocol-2.4.2" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -46417,6 +47583,10 @@ in
           sources."simple-get-3.0.2"
         ];
       })
+=======
+      sources."bittorrent-protocol-2.4.2"
+      sources."bittorrent-tracker-9.9.1"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."bl-1.2.2"
       sources."blob-to-buffer-1.2.8"
       sources."block-stream2-1.1.0"
@@ -46651,11 +47821,15 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-2.0.5"
+<<<<<<< HEAD
       (sources."ut_metadata-3.2.2" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
       })
+=======
+      sources."ut_metadata-3.2.2"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."ut_pex-1.2.1"
       sources."util-deprecate-1.0.2"
       (sources."videostream-2.4.2" // {
@@ -46701,7 +47875,15 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
+<<<<<<< HEAD
       sources."@types/node-10.5.0"
+=======
+<<<<<<< HEAD
+      sources."@types/node-10.3.1"
+=======
+      sources."@types/node-10.3.2"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.7.1"
@@ -46969,11 +48151,15 @@ in
       sources."es6-symbol-3.1.1"
       sources."es6-weak-map-2.0.2"
       sources."escape-string-regexp-1.0.5"
+<<<<<<< HEAD
       (sources."escodegen-1.10.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
+=======
+      sources."escodegen-1.10.0"
+>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5
       sources."escope-3.6.0"
       (sources."eslint-4.19.1" // {
         dependencies = [