diff --git a/.github/funding.yml b/.github/funding.yml new file mode 100644 index 0000000000..bb0e8b8872 --- /dev/null +++ b/.github/funding.yml @@ -0,0 +1 @@ +open_collective: git-it-electron diff --git a/README.md b/README.md index ad555ce1c6..09fdb3770a 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,23 @@ -# Git-it (Desktop App) +# Git-it (Desktop App) - adapted for Command Shift -[![Build Status](https://travis-ci.org/jlord/git-it-electron.svg?branch=master)](https://travis-ci.org/jlord/git-it-electron) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) - -![screen shot 2016-04-17 at 10 37 55 pm](https://cloud.githubusercontent.com/assets/1305617/14594613/23873f64-04ed-11e6-9d3b-72f424dd0842.png) -Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface). - -Previously it ran _in_ terminal (the command line application) with a guide online but now the guide _is_ the app and it runs on your desktop on its own :sparkles: **This will be the only maintained version going forward** :arrow_right: +![Git-It](screenshot.png) +Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface). Please work through all of the steps, ensuring you verify your solutions along the way. --- + ## Hello future Forkers, Branchers and Pull Requesters! This application contains challenges for learning Git and GitHub—by using _real_ Git and GitHub, not emulators. You'll be learning the awesome (and not so scary) command line and GitHub which means when you finish all of the challenges you'll have _real_ repositories on your GitHub account and green squares on your [contribution chart](https://github.com/blog/1360-introducing-contributions). ![contributions](https://raw.githubusercontent.com/jlord/git-it/master/ghcc.png) -## What to Install - -You will need this app, Git-it as well as a text editor. You'll also of course need Git and the first challenge in Git-it helps you get that set up. But if you want to get a head start, go for it! You'll continue to use Git and your text editor throughout your bright social coding future. - -As a part of the challenges you'll also create a (free) account on GitHub. If you've already got one, high-five! +## Applications -#### Git +You will need to use and install this app Git-it, as well as Visual Studio Code to edit the files. You'll also of course need Git (you should have Visual Studio Code and Git installed already). -We recommend installing [GitHub Desktop](http://desktop.github.com) (free) because it installs Git in the most consistent way across supported operating systems (Windows and Mac). We won't use the app itself in the challenges (but it is really useful once you get going in Git!), just the Git that it install for you. +### Git-it -Note—If you're using Windows, you should use the **Git Shell** app as your terminal—it is installed with GitHub Desktop. In Mac and Linux you can use the app **Terminal**, which is already on your computer. - -#### Text Editor - -I'm quite partial (I'm on the team!) but [Atom](http://atom.io) is a great text editor (also free) and it is built on [Electron.js](http://electron.atom.io), just like Git-it. Visit the website and download the version for your operating system. [Sublime](https://www.sublimetext.com), [Microsoft VS Code](https://code.visualstudio.com) and [Adobe Brackets](http://brackets.io) are other options. - -#### Git-it - -You can view the [releases](http://github.com/jlord/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux: +You can view the [releases](https://github.com/MCRcodes/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux: ![executables](https://cloud.githubusercontent.com/assets/1305617/14696588/2b10abf8-0731-11e6-945e-f3d57114bce9.png) @@ -42,13 +27,11 @@ You can view the [releases](http://github.com/jlord/git-it-electron/releases) se ## Get Started! -Open Git-it and click the button to begin the first challenge. Have your terminal and text editor open, too. Follow along with the instructions in each challenge and use the terminal or editor as instructed. +Open Git-it and click the button to begin the first challenge. Have your terminal and Visual Studio Code open too. Follow along with the instructions in each challenge and use the terminal or editor as instructed. When you've completed the steps in a challenge click 'Verify'. Depending on the challenge you may need to also select the folder you did your work in for Git-it to verify. -**Questions?** [Open an issue](http://github.com/jlord/git-it-electron/issues/new) on this repository. - -**Want to contribute or build locally?** See the [contributing documentation](CONTRIBUTING.md) +**Questions?** Post them in your cohort slack channel! --- diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000000..c01e969ec9 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +Please email jlord@github.com with reports. I am not a very active maintainer these days but I will try to do what I can <3 diff --git a/assets/css/buttons.css b/assets/css/buttons.css index 2f43e547ca..c2469fc022 100644 --- a/assets/css/buttons.css +++ b/assets/css/buttons.css @@ -3,7 +3,7 @@ button { display: inline-block; - background-color: rgba(203, 203, 203, 0.38); + background-color: #322b32; color: #FFFFFF; padding: 6px 12px; margin-bottom: 0; @@ -20,11 +20,11 @@ button:focus { } button:hover { - background-color: #badfff; + background-color: #201b20; } button:disabled { - background-color: rgba(24,105,177,1); + background-color: #695a69; } button .octicon { @@ -39,30 +39,30 @@ button .octicon { .btn-primary { margin: 9px 0; - background: #0087ff; + background: #774872; color: #fff; border-radius: 2px; text-transform: inherit; } .btn-secondary { - background: #8cf; + background: #a0639a; color: #fff; border-radius: 2px; } .btn-white { background: #fff; - color: #0087ff; + color: #774872; border-radius: 2px; } .btn-outline { - border: 1px solid #8cf; + border: 1px solid #774872; background: none; padding: 4px 13px; border-radius: 3px; - color: #0087ff; + color: #774872; display: inline-block; } @@ -75,7 +75,7 @@ button .octicon { } .btn-primary:hover { - background: #057ce7; + background: #8c5586; } .btn-large { @@ -89,47 +89,48 @@ button .octicon { } .border-group-left { - border: 1px solid #0087ff; + border: 1px solid #774872; border-radius: 2px 0 0 2px; padding: 10px 14px; } .border-group-middle { - border-top: 1px solid #0087ff; - border-bottom: 1px solid #0087ff; + border-top: 1px solid #774872; + border-bottom: 1px solid #774872; padding: 10px 14px; margin-left: -4px; } .border-group-right { - border: 1px solid #0087ff; + border: 1px solid #774872; border-radius: 0 2px 2px 0; padding: 10px 14px; } .border-group-right.btn { - border: 1px solid #88CCFF; - color: #88CCFF; - border-left-color: #0087FF; + border: 1px solid #8c5586; + color: #8c5586; + border-left-color: #774872; } .border-group-right.btn:hover { - border: 1px solid #0087ff; - color: #0087ff; + border: 1px solid #774872; + color: #774872; cursor: pointer; } .border-group-container { - color: #0087ff; + color: #774872; padding: 20px 0; user-select: none; } +/* TODO there are two of these */ .lang-select { padding: 4px 13px; position: absolute; height: 36px; - width: 100px; + width: 150px; margin: 5px 8px; top: 0; left: 0; @@ -143,7 +144,7 @@ button .octicon { /*border-top-color: #8cf;*/ border-top-color: #A6A6A6; position: relative; - left: 40px; + left: 66px; top: 5px; pointer-events: none; display: inline-block; diff --git a/assets/css/new-challenge.css b/assets/css/new-challenge.css index cac53892ca..a6e4c04082 100644 --- a/assets/css/new-challenge.css +++ b/assets/css/new-challenge.css @@ -20,11 +20,11 @@ } .blue-border.border-box { - border-color: #BADFFF; + border-color: #a0639a; } .blue-border.border-box::before { - color: #0087ff; + color: #774872; } .grey-border.border-box { @@ -32,7 +32,7 @@ } .grey-border.border-box::before { - color: rgba(51, 57, 53, 0.83); + color: #322b32; } @@ -53,8 +53,8 @@ } .blue-border.border-box code { - background: rgba(136, 204, 255, 0.15); - color: #4F6375; + background: #efefef; + color: #333; } .blue-border.border-box code.comment { @@ -63,7 +63,7 @@ } gre7-border.border-box code { - background: rgba(157, 166, 179, 0.16); + background: #efefef; } /* RESET MARGINS AND PADDINGS IN BOXES @@ -88,26 +88,6 @@ gre7-border.border-box code { /* This option gives solid boxes an octicon tab */ - /*.solid-box::before { - margin: -40px -8px 0; - float: left; - border-radius: 2px; - font-family: 'Octicons'; - font-weight: 200; - font-size: 32px; - padding: 4px 8px 0px; - }*/ - - /*.chal-goal.bright-blue.solid-box::before { - content: "\f07b"; - background: rgba(136,204,255,1); - } - - .chal-background.light-blue.solid-box::before { - content: "\f007"; - background: #E6F6FF; - }*/ - .solid-box { border-radius: 2px; padding: 24px; @@ -115,17 +95,17 @@ gre7-border.border-box code { } .light-blue.solid-box { - color: #4F6375; - background: rgba(136, 204, 255, 0.18); + color: #333; + background: #efefef; } .bright-blue.solid-box { color: #fff; - background: rgba(136,204,255,1); + background: #efefef; } .bold-blue.solid-box { - background-color: #0087ff; + background-color: #774872; color: #fff;; } @@ -217,7 +197,7 @@ gre7-border.border-box code { code { font-size: 0.8em; - background: rgba(157, 166, 179, 0.16); + background: #efefef; padding: 6px 6px 3px 6px; border-radius: 2px; font-family: 'Liberation Mono', Monaco, Courier New, monospace; @@ -231,7 +211,7 @@ code.shell:before { .blue-border-box code { border: none; - background: rgba(136, 204, 255, 0.15); + background: #efefef; } .prenext { @@ -248,7 +228,7 @@ code.shell:before { -------------------------------------------------------------------------- */ .blue-border-box { - border: 1px solid #BADFFF; + border: 1px solid #efefef; padding: 18px; margin: 18px 0 36px; border-radius: 2px; @@ -256,6 +236,6 @@ code.shell:before { .blue-border-box code { border: none; - color: #4F6375; - background: rgba(136, 204, 255, 0.15); + color: #333; + background: #efefef; } diff --git a/assets/css/new-style.css b/assets/css/new-style.css index 670af9d4c6..86e62c9fc7 100644 --- a/assets/css/new-style.css +++ b/assets/css/new-style.css @@ -35,7 +35,7 @@ body { font-family: 'Source Sans Pro', 'Helvetica Neue', 'Arial', sans-serif; line-height: 1.8em; - color: rgba(51, 57, 53, 0.83); + color: #322b32; background-color: #f5f5f5; background-color: #fff; font-size: 1.1em; @@ -51,19 +51,19 @@ li { } a { - color: #0087ff; + color: #774872; text-decoration: none; } a:hover { - color: #4BABFF; + color: #8c5586; } blockquote { - border-left: 1px solid rgb(186, 223, 255); + border-left: 1px solid #a0639a; padding-left: 18px; margin: 30px 0; - color: rgba(51, 57, 53, 0.83); + color: #322b32; } img { @@ -165,7 +165,7 @@ ul.no-list-style { text-transform: capitalize; font-size: 19px; font-weight: 800; - color: #4BABFF; + color: #8c5586; line-height: 1; display: inline-block; } @@ -177,7 +177,7 @@ ul.no-list-style { } .filledblock:hover { - background: #4BABFF; + background: #8c5586; color: #fff; border-radius: 2px; } @@ -225,7 +225,7 @@ ul.no-list-style { top: 9px; height: 6px; width: 6px; - border: 0.15em solid #0087ff; + border: 0.15em solid #774872; border-radius: 50px; } @@ -235,8 +235,8 @@ ul.no-list-style { top: 12px; height: 6px; width: 6px; - border: 0.15em solid #0087ff; - background-color: #0087ff; + border: 0.15em solid #774872; + background-color: #774872; border-radius: 50px; } @@ -250,7 +250,7 @@ ul.no-list-style { } .challenge-item.current { - background-color: #8cf; + background-color: #a0639a; color: #fff; margin-right: -3px; border-color: white; @@ -265,7 +265,7 @@ ul.no-list-style { .challenge-name { text-transform: capitalize; font-weight: 900; - color: #0087ff; + color: #774872; } /* FOOTER @@ -277,7 +277,7 @@ ul.no-list-style { width: 10px; height: 10px; border-bottom-left-radius: 8px; - border-color: #000; + border-color: #322b32; border-bottom: 1px solid; border-left: 1px solid; position: absolute; @@ -301,7 +301,7 @@ ul.no-list-style { width: 10px; height: 10px; border-bottom-right-radius: 8px; - border-color: #000; + border-color: #322b32; border-bottom: 1px solid; border-right: 1px solid; position: relative; @@ -331,23 +331,23 @@ ul.no-list-style { } .progress-circles .border-left { - border-left: 1px solid #0087ff; + border-left: 1px solid #774872; } .progress-circle { display: inline-block; width: 10px; height: 10px; - border: 0.15em solid #0087ff; + border: 0.15em solid #774872; border-radius: 50px; } .progress-circle.completed { - background: #0087ff; + background: #774872; } .progress-circle.completed + .progress-circle:not(.completed) { - background: #8cf; + background: #a0639a; animation: blink 1s steps(2, start) infinite; } diff --git a/assets/css/style.css b/assets/css/style.css index e1417bae51..c786356eb5 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -40,8 +40,7 @@ body { font-family: 'Source Sans Pro', 'Helvetica Neue', 'Arial', sans-serif; line-height: 1.8em; - color: rgba(51, 57, 53, 0.83); - background-color: #f5f5f5; + color: #322b32; background-color: #fff; font-size: 15px; margin: 0; @@ -60,12 +59,12 @@ h1, h2, h3, h4, .toc { } a { - color: #0087ff; + color: #774872; text-decoration: none; } a:hover { - color: #4BABFF; + color: #8c5586; } p { @@ -74,10 +73,10 @@ p { } blockquote { - border-left: 2px solid rgba(51, 57, 53, 0.83); + border-left: 2px solid #322b32; padding-left: 18px; margin: 30px 0; - color: rgba(51, 57, 53, 0.83); + color: #322b32; } img { @@ -172,7 +171,7 @@ img { text-transform: capitalize; font-size: 19px; font-weight: 800; - color: #4BABFF; + color: #8c5586; line-height: 1; display: inline-block; } @@ -184,7 +183,7 @@ img { } .filledblock:hover { - background: #4BABFF; + background: #8c5586; color: #fff; } @@ -230,7 +229,7 @@ img { top: 9px; height: 6px; width: 6px; - border: 0.15em solid #0087ff; + border: 0.15em solid #774872; border-radius: 50px; } @@ -240,8 +239,8 @@ img { top: 12px; height: 6px; width: 6px; - border: 0.15em solid #0087ff; - background-color: #0087ff; + border: 0.15em solid #774872; + background-color: #774872; border-radius: 50px; } @@ -255,8 +254,8 @@ img { } .challenge-item.current { - background-color: #8cf; - color: #0087FF; + background-color: #a0639a; + color: #774872; margin-right: -3px; border-color: white; border-radius: 0 2px 2px 0; @@ -270,7 +269,7 @@ img { .challenge-name { text-transform: capitalize; font-weight: 900; - color: #0087ff; + color: #774872; } /* CHALLENGES @@ -332,7 +331,7 @@ code.shell:before { .blue-border-box h2, .challenge h2 { - color: #08f; + color: #8c5586; } .blue-border-box h2, @@ -378,14 +377,14 @@ code.shell:before { .challenge p { margin: 0; - color: #0087ff; + color: #774872; } /* VERIFY -------------------------------------------------------------------------- */ .verify { - background-color: #0087ff; + background-color: #774872; color: #fff; padding: 18px; border-radius: 2px; @@ -512,30 +511,30 @@ button .octicon { .btn-primary { margin: 9px 0; - background: #0087ff; + background: #774872; color: #fff; border-radius: 2px; text-transform: inherit; } .btn-secondary { - background: #8cf; + background: #a0639a; color: #fff; border-radius: 2px; } .btn-white { background: #fff; - color: #0087ff; + color: #774872; border-radius: 2px; } .btn-outline { - border: 1px solid #8cf; + border: 1px solid #774872; background: none; padding: 4px 13px; border-radius: 3px; - color: #0087ff; + color: #774872; display: inline-block; } @@ -548,7 +547,7 @@ button .octicon { } .btn-primary:hover { - background: #057ce7; + background: #8c5586; } .btn-large { @@ -562,46 +561,47 @@ button .octicon { } .border-group-left { - border: 1px solid #0087ff; + border: 1px solid #774872; border-radius: 2px 0 0 2px; padding: 10px 14px; } .border-group-middle { - border-top: 1px solid #0087ff; - border-bottom: 1px solid #0087ff; + border-top: 1px solid #774872; + border-bottom: 1px solid #774872; padding: 10px 14px; margin-left: -4px; } .border-group-right { - border: 1px solid #0087ff; + border: 1px solid #774872; border-radius: 0 2px 2px 0; padding: 10px 14px; } .border-group-right.btn { - border: 1px solid #88CCFF; - color: #88CCFF; - border-left-color: #0087FF; + border: 1px solid #a0639a; + color: #fff; + border-left-color: #774872; } .border-group-right.btn:hover { - border: 1px solid #0087ff; - color: #0087ff; + border: 1px solid #774872; + color: #774872; cursor: pointer; } .border-group-container { - color: #0087ff; + color: #774872; padding: 20px 0; } +/* TODO there are two of these */ .lang-select { padding: 4px 13px; position: absolute; height: 36px; - width: 100px; + width: 150px; margin: 5px 8px; top: 0; left: 0; @@ -615,7 +615,7 @@ button .octicon { /*border-top-color: #8cf;*/ border-top-color: #A6A6A6; position: relative; - left: 40px; + left: 66px; top: 5px; pointer-events: none; display: inline-block; @@ -631,7 +631,7 @@ button .octicon { width: 10px; height: 10px; border-bottom-left-radius: 8px; - border-color: #000; + border-color: #322b32; border-bottom: 1px solid; border-left: 1px solid; position: absolute; @@ -655,7 +655,7 @@ button .octicon { width: 10px; height: 10px; border-bottom-right-radius: 8px; - border-color: #000; + border-color: #322b32; border-bottom: 1px solid; border-right: 1px solid; position: relative; @@ -680,19 +680,19 @@ button .octicon { -------------------------------------------------------------------------- */ .progress-circles .border-left { - border-left: 1px solid #0087ff; + border-left: 1px solid #774872; } .progress-circle { display: inline-block; width: 10px; height: 10px; - border: 0.15em solid #0087ff; + border: 0.15em solid #774872; border-radius: 50px; } .progress-circle.completed { - background: #0087ff; + background: #774872; } .progress-circle.completed + .progress-circle:not(.completed) { diff --git a/lib/build-challenges.js b/lib/build-challenges.js index 71757cb9a8..3ea4d47406 100644 --- a/lib/build-challenges.js +++ b/lib/build-challenges.js @@ -132,7 +132,7 @@ function buildSidebar (filename, lang) { function grammarize (name, lang) { var correct = name var wrongWords = [ 'arent', 'githubbin', 'its' ] - var rightWords = [ "aren't", 'GitHubbin', "it's" ] + var rightWords = [ "aren't", 'GitHubbin\'', "it's" ] wrongWords.forEach(function (word, i) { if (name.match(word)) { diff --git a/lib/locale-es-ES.json b/lib/locale-es-ES.json new file mode 100644 index 0000000000..06b40437db --- /dev/null +++ b/lib/locale-es-ES.json @@ -0,0 +1,8 @@ +{ + "n": { + }, + "v": { + }, + "adj": { + } +} \ No newline at end of file diff --git a/lib/locale.js b/lib/locale.js index 7811b2076a..1cd7663eb6 100644 --- a/lib/locale.js +++ b/lib/locale.js @@ -14,6 +14,7 @@ var available = { 'pt-BR': 'Português Brasileiro', 'uk-UA': 'Українська', 'es-CO': 'Español (Colombia)', + 'es-ES': 'Español (España)', 'fr-FR': 'Français' } @@ -29,7 +30,7 @@ var aliases = { 'kr': 'ko-KR', 'br': 'pt-BR', 'uk': 'uk-UA', - 'es': 'es-CO', + 'es': 'es-ES', 'fr': 'fr-FR' } diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000000..1692812c4d --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6813 @@ +{ + "name": "git-it-electron", +<<<<<<< HEAD + "version": "4.3.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/commander": { + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz", + "integrity": "sha512-0QEFiR8ljcHp9bAbWxecjVRuAMr16ivPiGOw6KFQBVrVd0RQIcM3xKdRisH2EDWgVWujiYtHwhSkSUoAAGzH7Q==", + "dev": true, + "requires": { + "commander": "*" + } + }, + "@types/node": { + "version": "8.10.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz", + "integrity": "sha512-zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==", + "dev": true + }, + "@types/semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==", +======= + "version": "4.2.2", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/node": { + "version": "8.10.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.13.tgz", + "integrity": "sha512-AorNXRHoPVxIUIVmr6uJXRnvlPOSNKAJF5jZ1JOj1/IxYMocZzvQooNeLU02Db6kpy1IVIySTOvuIxmUF1HrOg==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, + "acorn": { +<<<<<<< HEAD + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", +======= + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", + "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "acorn-to-esprima": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/acorn-to-esprima/-/acorn-to-esprima-2.0.8.tgz", + "integrity": "sha1-AD8MZC65ITL0F9NwjxStqCrfLrE=", + "dev": true + }, + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "requires": { +<<<<<<< HEAD + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" +======= + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" +======= + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "alter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz", + "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=", + "dev": true, + "requires": { +<<<<<<< HEAD + "stable": "~0.1.3" +======= + "stable": "0.1.8" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, + "ansi-escapes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { +<<<<<<< HEAD + "sprintf-js": "~1.0.2" +======= + "sprintf-js": "1.0.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { +<<<<<<< HEAD + "array-uniq": "^1.0.1" +======= + "array-uniq": "1.0.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true + }, + "asar": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/asar/-/asar-0.13.1.tgz", + "integrity": "sha512-HJnZadTbDVDhBDv3tMyDov3ZnwMYYmz80/+a7S6cFPvulUyRz55UG5hOyHeWSP1iZud6vjFq8GOYM6xxtxJECQ==", + "dev": true, + "requires": { +<<<<<<< HEAD + "chromium-pickle-js": "^0.2.0", + "commander": "^2.9.0", + "cuint": "^0.2.1", + "glob": "^6.0.4", + "minimatch": "^3.0.3", + "mkdirp": "^0.5.0", + "mksnapshot": "^0.3.0", +======= + "chromium-pickle-js": "0.2.0", + "commander": "2.15.1", + "cuint": "0.2.2", + "glob": "6.0.4", + "minimatch": "3.0.4", + "mkdirp": "0.5.0", + "mksnapshot": "0.3.1", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "tmp": "0.0.28" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { +<<<<<<< HEAD + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" +======= + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "asn1": { +<<<<<<< HEAD + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } +======= + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "ast-traverse": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz", + "integrity": "sha1-ac8rg4bxnc2hux4F1o/jWdiJfeY=", + "dev": true + }, + "ast-types": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz", + "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=", + "dev": true + }, + "async": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { +<<<<<<< HEAD + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" +======= + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { +<<<<<<< HEAD + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" +======= + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + } + } + }, + "babel-core": { + "version": "5.8.38", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz", + "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=", + "dev": true, + "requires": { + "babel-plugin-constant-folding": "^1.0.1", + "babel-plugin-dead-code-elimination": "^1.0.2", + "babel-plugin-eval": "^1.0.1", + "babel-plugin-inline-environment-variables": "^1.0.1", + "babel-plugin-jscript": "^1.0.4", + "babel-plugin-member-expression-literals": "^1.0.1", + "babel-plugin-property-literals": "^1.0.1", + "babel-plugin-proto-to-assign": "^1.0.3", + "babel-plugin-react-constant-elements": "^1.0.3", + "babel-plugin-react-display-name": "^1.0.3", + "babel-plugin-remove-console": "^1.0.1", + "babel-plugin-remove-debugger": "^1.0.1", + "babel-plugin-runtime": "^1.0.7", + "babel-plugin-undeclared-variables-check": "^1.0.2", + "babel-plugin-undefined-to-void": "^1.1.6", + "babylon": "^5.8.38", + "bluebird": "^2.9.33", + "chalk": "^1.0.0", + "convert-source-map": "^1.1.0", + "core-js": "^1.0.0", + "debug": "^2.1.1", + "detect-indent": "^3.0.0", + "esutils": "^2.0.0", + "fs-readdir-recursive": "^0.1.0", + "globals": "^6.4.0", + "home-or-tmp": "^1.0.0", + "is-integer": "^1.0.4", + "js-tokens": "1.0.1", + "json5": "^0.4.0", + "lodash": "^3.10.0", + "minimatch": "^2.0.3", + "output-file-sync": "^1.1.0", + "path-exists": "^1.0.0", + "path-is-absolute": "^1.0.0", + "private": "^0.1.6", + "regenerator": "0.8.40", + "regexpu": "^1.3.0", + "repeating": "^1.1.2", + "resolve": "^1.1.6", + "shebang-regex": "^1.0.0", + "slash": "^1.0.0", + "source-map": "^0.5.0", + "source-map-support": "^0.2.10", + "to-fast-properties": "^1.0.0", + "trim-right": "^1.0.0", + "try-resolve": "^1.0.0" +======= + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz", + "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=", + "dev": true, + "requires": { + "babel-plugin-constant-folding": "1.0.1", + "babel-plugin-dead-code-elimination": "1.0.2", + "babel-plugin-eval": "1.0.1", + "babel-plugin-inline-environment-variables": "1.0.1", + "babel-plugin-jscript": "1.0.4", + "babel-plugin-member-expression-literals": "1.0.1", + "babel-plugin-property-literals": "1.0.1", + "babel-plugin-proto-to-assign": "1.0.4", + "babel-plugin-react-constant-elements": "1.0.3", + "babel-plugin-react-display-name": "1.0.3", + "babel-plugin-remove-console": "1.0.1", + "babel-plugin-remove-debugger": "1.0.1", + "babel-plugin-runtime": "1.0.7", + "babel-plugin-undeclared-variables-check": "1.0.2", + "babel-plugin-undefined-to-void": "1.1.6", + "babylon": "5.8.38", + "bluebird": "2.11.0", + "chalk": "1.1.3", + "convert-source-map": "1.5.1", + "core-js": "1.2.7", + "debug": "2.6.9", + "detect-indent": "3.0.1", + "esutils": "2.0.2", + "fs-readdir-recursive": "0.1.2", + "globals": "6.4.1", + "home-or-tmp": "1.0.0", + "is-integer": "1.0.7", + "js-tokens": "1.0.1", + "json5": "0.4.0", + "lodash": "3.10.1", + "minimatch": "2.0.10", + "output-file-sync": "1.1.2", + "path-exists": "1.0.0", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "regenerator": "0.8.40", + "regexpu": "1.3.0", + "repeating": "1.1.3", + "resolve": "1.7.1", + "shebang-regex": "1.0.0", + "slash": "1.0.0", + "source-map": "0.5.7", + "source-map-support": "0.2.10", + "to-fast-properties": "1.0.3", + "trim-right": "1.0.1", + "try-resolve": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "bluebird": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=", + "dev": true + }, + "globals": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", + "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=", + "dev": true + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "brace-expansion": "^1.0.0" +======= + "brace-expansion": "1.1.11" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "path-exists": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz", + "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=", + "dev": true + }, + "repeating": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", + "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-finite": "^1.0.0" +======= + "is-finite": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "babel-plugin-constant-folding": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz", + "integrity": "sha1-g2HTZMmORJw2kr26Ue/whEKQqo4=", + "dev": true + }, + "babel-plugin-dead-code-elimination": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz", + "integrity": "sha1-X3xFEnTc18zNv7s+C4XdKBIfD2U=", + "dev": true + }, + "babel-plugin-eval": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz", + "integrity": "sha1-ovrtJc5r5preS/7CY/cBaRlZUNo=", + "dev": true + }, + "babel-plugin-inline-environment-variables": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz", + "integrity": "sha1-H1jOkSB61qgmqL9kX6/mj/X+P/4=", + "dev": true + }, + "babel-plugin-jscript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz", + "integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w=", + "dev": true + }, + "babel-plugin-member-expression-literals": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz", + "integrity": "sha1-zF7bD6qNyScXDnTW0cAkQAIWJNM=", + "dev": true + }, + "babel-plugin-property-literals": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz", + "integrity": "sha1-AlIwGQAZKYCxwRjv6kjOk6q4MzY=", + "dev": true + }, + "babel-plugin-proto-to-assign": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz", + "integrity": "sha1-xJ56/QL1d7xNoF6i3wAiUM980SM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash": "^3.9.3" +======= + "lodash": "3.10.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "babel-plugin-react-constant-elements": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz", + "integrity": "sha1-lGc26DeEKcvDSdz/YvUcFDs041o=", + "dev": true + }, + "babel-plugin-react-display-name": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz", + "integrity": "sha1-dU/jiSboQkpOexWrbqYTne4FFPw=", + "dev": true + }, + "babel-plugin-remove-console": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz", + "integrity": "sha1-2PJFVsOgUAXUKqqv0neH9T/wE6c=", + "dev": true + }, + "babel-plugin-remove-debugger": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz", + "integrity": "sha1-/S6jzWGkKK0fO5yJiC/0KT6MFMc=", + "dev": true + }, + "babel-plugin-runtime": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz", + "integrity": "sha1-v3x9lm3Vbs1cF/ocslPJrLflSq8=", + "dev": true + }, + "babel-plugin-undeclared-variables-check": { + "version": "1.0.2", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz", + "integrity": "sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=", + "dev": true, + "requires": { + "leven": "^1.0.2" +======= + "resolved": "https://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz", + "integrity": "sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=", + "dev": true, + "requires": { + "leven": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "babel-plugin-undefined-to-void": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz", + "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=", + "dev": true + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "core-js": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", +======= + "core-js": "2.5.6", + "regenerator-runtime": "0.11.1" + }, + "dependencies": { + "core-js": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", + "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" +======= + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.10" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "lodash": { +<<<<<<< HEAD + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", +======= + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + }, + "dependencies": { + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", +======= + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "1.0.3" + }, + "dependencies": { + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "babylon": { + "version": "5.8.38", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz", + "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base64-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz", + "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=", + "dev": true + }, + "bcrypt-pbkdf": { +<<<<<<< HEAD + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "optional": true, + "requires": { + "tweetnacl": "^0.14.3" +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "binary": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", + "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=", + "dev": true, + "requires": { +<<<<<<< HEAD + "buffers": "~0.1.1", + "chainsaw": "~0.1.0" + } + }, + "bluebird": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz", + "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==", +======= + "buffers": "0.1.1", + "chainsaw": "0.1.0" + } + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, +<<<<<<< HEAD +======= + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "requires": { + "hoek": "4.2.1" + } + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { +<<<<<<< HEAD + "balanced-match": "^1.0.0", +======= + "balanced-match": "1.0.0", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "concat-map": "0.0.1" + } + }, + "breakable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz", + "integrity": "sha1-eEp5eRWjjq0nutRWtVcstLuqeME=", + "dev": true + }, +<<<<<<< HEAD + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" + } + }, + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "dev": true + }, + "buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", + "dev": true + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, +======= +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "buffers": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", + "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" +======= + "camelcase": "2.1.1", + "map-obj": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "requires": { +<<<<<<< HEAD + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" +======= + "align-text": "0.1.4", + "lazy-cache": "1.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "chainsaw": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", + "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "traverse": ">=0.3.0 <0.4" +======= + "traverse": "0.3.9" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "chalk": { + "version": "1.1.3", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" +======= + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "cheerio": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", + "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", + "requires": { +<<<<<<< HEAD + "css-select": "~1.0.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "~3.8.1", + "lodash": "^3.2.0" +======= + "css-select": "1.0.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.8.3", + "lodash": "3.10.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "chromium-pickle-js": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", + "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=", + "dev": true + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "restore-cursor": "^1.0.1" +======= + "restore-cursor": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "cli-width": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz", + "integrity": "sha1-pNKT72frt7iNSk1CwMzwDE0eNm0=", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "center-align": "^0.1.1", + "right-align": "^0.1.1", +======= + "center-align": "0.1.3", + "right-align": "0.1.3", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + } + } + }, + "clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, + "combined-stream": { +<<<<<<< HEAD + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", + "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "commander": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz", + "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==", +======= + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "commoner": { + "version": "0.10.8", + "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz", + "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "commander": "^2.5.0", + "detective": "^4.3.1", + "glob": "^5.0.15", + "graceful-fs": "^4.1.2", + "iconv-lite": "^0.4.5", + "mkdirp": "^0.5.0", + "private": "^0.1.6", + "q": "^1.1.2", + "recast": "^0.11.17" +======= + "commander": "2.15.1", + "detective": "4.7.1", + "glob": "5.0.15", + "graceful-fs": "4.1.11", + "iconv-lite": "0.4.23", + "mkdirp": "0.5.0", + "private": "0.1.8", + "q": "1.5.1", + "recast": "0.11.23" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + }, + "recast": { + "version": "0.11.23", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz", + "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=", + "dev": true, + "requires": { + "ast-types": "0.9.6", +<<<<<<< HEAD + "esprima": "~3.1.0", + "private": "~0.1.5", + "source-map": "~0.5.0" +======= + "esprima": "3.1.3", + "private": "0.1.8", + "source-map": "0.5.7" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "compare-version": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", + "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { +<<<<<<< HEAD + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" +======= + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" +======= + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { +<<<<<<< HEAD + "safe-buffer": "~5.1.0" +======= + "safe-buffer": "5.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "config-chain": { +<<<<<<< HEAD + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "dev": true, + "requires": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "convert-source-map": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", + "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } +======= + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz", + "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=", + "dev": true, + "requires": { + "ini": "1.3.5", + "proto-list": "1.2.4" + } + }, + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, +<<<<<<< HEAD +======= + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "requires": { + "hoek": "4.2.1" + } + } + } + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "css-select": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", + "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", + "requires": { +<<<<<<< HEAD + "boolbase": "~1.0.0", + "css-what": "1.0", + "domutils": "1.4", + "nth-check": "~1.0.0" +======= + "boolbase": "1.0.0", + "css-what": "1.0.0", + "domutils": "1.4.3", + "nth-check": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "css-what": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", + "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w=" + }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", + "dev": true + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { +<<<<<<< HEAD + "array-find-index": "^1.0.1" +======= + "array-find-index": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "es5-ext": "^0.10.9" +======= + "es5-ext": "0.10.42" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { +<<<<<<< HEAD + "assert-plus": "^1.0.0" +======= + "assert-plus": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "debug-log": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", + "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "decompress-zip": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz", + "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "binary": "^0.3.0", + "graceful-fs": "^4.1.3", + "mkpath": "^0.1.0", + "nopt": "^3.0.1", + "q": "^1.1.2", + "readable-stream": "^1.1.8", +======= + "binary": "0.3.0", + "graceful-fs": "4.1.11", + "mkpath": "0.1.0", + "nopt": "3.0.6", + "q": "1.5.1", + "readable-stream": "1.1.14", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "touch": "0.0.3" + } + }, + "deep-extend": { +<<<<<<< HEAD + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", +======= + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "dev": true, + "requires": { +<<<<<<< HEAD + "clone": "^1.0.2" +======= + "clone": "1.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "defined": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", + "dev": true + }, + "defs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz", + "integrity": "sha1-siYJ8sehG6ej2xFoBcE5scr/qdI=", + "dev": true, + "requires": { +<<<<<<< HEAD + "alter": "~0.2.0", + "ast-traverse": "~0.1.1", + "breakable": "~1.0.0", + "esprima-fb": "~15001.1001.0-dev-harmony-fb", + "simple-fmt": "~0.1.0", + "simple-is": "~0.2.0", + "stringmap": "~0.2.2", + "stringset": "~0.2.1", + "tryor": "~0.1.2", + "yargs": "~3.27.0" + }, + "dependencies": { +======= + "alter": "0.2.0", + "ast-traverse": "0.1.1", + "breakable": "1.0.0", + "esprima-fb": "15001.1001.0-dev-harmony-fb", + "simple-fmt": "0.1.0", + "simple-is": "0.2.0", + "stringmap": "0.2.2", + "stringset": "0.2.1", + "tryor": "0.1.2", + "yargs": "3.27.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "esprima-fb": { + "version": "15001.1001.0-dev-harmony-fb", + "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz", + "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=", + "dev": true +<<<<<<< HEAD +======= + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true + }, + "yargs": { + "version": "3.27.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz", + "integrity": "sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "window-size": "0.1.4", + "y18n": "3.2.1" + } +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + }, + "deglob": { + "version": "1.1.2", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/deglob/-/deglob-1.1.2.tgz", + "integrity": "sha1-dtV3wl/j9zKUEqK1nq3qV6xQDj8=", + "dev": true, + "requires": { + "find-root": "^1.0.0", + "glob": "^7.0.5", + "ignore": "^3.0.9", + "pkg-config": "^1.1.0", + "run-parallel": "^1.1.2", + "uniq": "^1.0.1", + "xtend": "^4.0.0" +======= + "resolved": "https://registry.npmjs.org/deglob/-/deglob-1.1.2.tgz", + "integrity": "sha1-dtV3wl/j9zKUEqK1nq3qV6xQDj8=", + "dev": true, + "requires": { + "find-root": "1.1.0", + "glob": "7.1.2", + "ignore": "3.3.8", + "pkg-config": "1.1.1", + "run-parallel": "1.1.9", + "uniq": "1.0.1", + "xtend": "4.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "find-root": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", + "dev": true + }, + "glob": { +<<<<<<< HEAD + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" +======= + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + } + } + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { +<<<<<<< HEAD + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" +======= + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "detect-indent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", + "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=", + "dev": true, + "requires": { +<<<<<<< HEAD + "get-stdin": "^4.0.1", + "minimist": "^1.1.0", + "repeating": "^1.1.0" +======= + "get-stdin": "4.0.1", + "minimist": "1.2.0", + "repeating": "1.1.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "repeating": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", + "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-finite": "^1.0.0" +======= + "is-finite": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "detective": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", + "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==", + "dev": true, + "requires": { +<<<<<<< HEAD + "acorn": "^5.2.1", + "defined": "^1.0.0" +======= + "acorn": "5.5.3", + "defined": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "dezalgo": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", + "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "asap": "^2.0.0", + "wrappy": "1" +======= + "asap": "2.0.6", + "wrappy": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "diff": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", + "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=", + "dev": true + }, + "disparity": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/disparity/-/disparity-2.0.0.tgz", + "integrity": "sha1-V92stHMkrl9Y0swNqIbbTOnutxg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "ansi-styles": "^2.0.1", + "diff": "^1.3.2" +======= + "ansi-styles": "2.2.1", + "diff": "1.4.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "doctrine": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "esutils": "^1.1.6", +======= + "esutils": "1.1.6", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "isarray": "0.0.1" + }, + "dependencies": { + "esutils": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz", + "integrity": "sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=", + "dev": true + } + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "requires": { +<<<<<<< HEAD + "domelementtype": "~1.1.1", + "entities": "~1.1.1" +======= + "domelementtype": "1.1.3", + "entities": "1.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" + } + } + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "requires": { +<<<<<<< HEAD + "domelementtype": "1" +======= + "domelementtype": "1.3.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "domutils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", + "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", + "requires": { +<<<<<<< HEAD + "domelementtype": "1" + } + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "optional": true, + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "editorconfig": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.0.tgz", + "integrity": "sha512-j7JBoj/bpNzvoTQylfRZSc85MlLNKWQiq5y6gwKhmqD2h1eZ+tH4AXbkhEJD468gjDna/XMx2YtSkCxBRX9OGg==", + "dev": true, + "requires": { + "@types/commander": "^2.11.0", + "@types/semver": "^5.4.0", + "commander": "^2.11.0", + "lru-cache": "^4.1.1", + "semver": "^5.4.1", + "sigmund": "^1.0.1" + } + }, + "electron": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.8.tgz", + "integrity": "sha512-1f9zJehcTTGjrkb06o6ds+gsRq6SYhZJyxOk6zIWjRH8hVy03y/RzUDELzNas71f5vcvXmfGVvyjeEsadDI8tg==", + "dev": true, + "requires": { + "@types/node": "^8.0.24", + "electron-download": "^3.0.1", + "extract-zip": "^1.0.3" +======= + "domelementtype": "1.3.0" + } + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "editorconfig": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz", + "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "commander": "2.15.1", + "lru-cache": "3.2.0", + "semver": "5.5.0", + "sigmund": "1.0.1" + } + }, + "electron": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.6.tgz", + "integrity": "sha512-rdbGinUDRh7rO0aJDXcaQ5UuJRg82wLkUU/V63wtaMFH04RVMkd5SUsyqgaP5IlVq3iYlJk/CPSVEsiBbPDMeg==", + "dev": true, + "requires": { + "@types/node": "8.10.13", + "electron-download": "3.3.0", + "extract-zip": "1.6.6" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "electron-download": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz", + "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.2.0", + "fs-extra": "^0.30.0", + "home-path": "^1.0.1", + "minimist": "^1.2.0", + "nugget": "^2.0.0", + "path-exists": "^2.1.0", + "rc": "^1.1.2", + "semver": "^5.3.0", + "sumchecker": "^1.2.0" +======= + "debug": "2.6.9", + "fs-extra": "0.30.0", + "home-path": "1.0.5", + "minimist": "1.2.0", + "nugget": "2.0.1", + "path-exists": "2.1.0", + "rc": "1.2.7", + "semver": "5.5.0", + "sumchecker": "1.3.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "electron-osx-sign": { + "version": "0.4.10", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz", + "integrity": "sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "bluebird": "^3.5.0", + "compare-version": "^0.1.2", + "debug": "^2.6.8", + "isbinaryfile": "^3.0.2", + "minimist": "^1.2.0", + "plist": "^2.1.0" +======= + "bluebird": "3.5.1", + "compare-version": "0.1.2", + "debug": "2.6.9", + "isbinaryfile": "3.0.2", + "minimist": "1.2.0", + "plist": "2.1.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "electron-packager": { + "version": "8.7.2", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-8.7.2.tgz", + "integrity": "sha1-RX078kvJYHwGrUsettqkrMrcIQg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "asar": "^0.13.0", + "debug": "^2.2.0", + "electron-download": "^4.0.0", + "electron-osx-sign": "^0.4.1", + "extract-zip": "^1.0.3", + "fs-extra": "^3.0.0", + "get-package-info": "^1.0.0", + "minimist": "^1.1.1", + "plist": "^2.0.0", + "rcedit": "^0.9.0", + "resolve": "^1.1.6", + "run-series": "^1.1.1", + "sanitize-filename": "^1.6.0", + "semver": "^5.3.0" + }, + "dependencies": { + "electron-download": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz", + "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==", + "dev": true, + "requires": { + "debug": "^3.0.0", + "env-paths": "^1.0.0", + "fs-extra": "^4.0.1", + "minimist": "^1.2.0", + "nugget": "^2.0.1", + "path-exists": "^3.0.0", + "rc": "^1.2.1", + "semver": "^5.4.1", + "sumchecker": "^2.0.2" + }, + "dependencies": { + "debug": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz", + "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" +======= + "asar": "0.13.1", + "debug": "2.6.9", + "electron-download": "4.1.0", + "electron-osx-sign": "0.4.10", + "extract-zip": "1.6.6", + "fs-extra": "3.0.1", + "get-package-info": "1.0.0", + "minimist": "1.2.0", + "plist": "2.1.0", + "rcedit": "0.9.0", + "resolve": "1.7.1", + "run-series": "1.1.8", + "sanitize-filename": "1.6.1", + "semver": "5.5.0" + }, + "dependencies": { + "electron-download": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz", + "integrity": "sha1-v5MsdG8vh//MCdHdRy8v9rkYeEU=", + "dev": true, + "requires": { + "debug": "2.6.9", + "env-paths": "1.0.0", + "fs-extra": "2.1.2", + "minimist": "1.2.0", + "nugget": "2.0.1", + "path-exists": "3.0.0", + "rc": "1.2.7", + "semver": "5.5.0", + "sumchecker": "2.0.2" + }, + "dependencies": { + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.2", + "jsonfile": "^3.0.0", + "universalify": "^0.1.0" +======= + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.6" +======= + "graceful-fs": "4.1.11" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, +<<<<<<< HEAD + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, +======= + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "sumchecker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", + "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.2.0" +======= + "debug": "2.6.9" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" + }, + "env-paths": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz", + "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=", + "dev": true + }, + "error-ex": { +<<<<<<< HEAD + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es5-ext": { + "version": "0.10.46", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz", + "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==", + "dev": true, + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "1" +======= + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "es5-ext": { + "version": "0.10.42", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz", + "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==", + "dev": true, + "requires": { + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { +<<<<<<< HEAD + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" +======= + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-symbol": "3.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" + } + }, + "es6-promise": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", + "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==", +======= + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-promise": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", + "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-symbol": "3.1.1", + "event-emitter": "~0.3.5" +======= + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "d": "1", + "es5-ext": "~0.10.14" +======= + "d": "1.0.0", + "es5-ext": "0.10.42" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" +======= + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "es6-map": "^0.1.3", + "es6-weak-map": "^2.0.1", + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" +======= + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "esformatter": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/esformatter/-/esformatter-0.8.2.tgz", + "integrity": "sha1-e6mIKqPtMIOfivds3fTxLaM3084=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^0.7.4", + "disparity": "^2.0.0", + "espree": "^2.2.4", + "glob": "^5.0.3", + "minimist": "^1.1.1", + "mout": ">=0.9 <2.0", + "npm-run": "^2.0.0", + "resolve": "^1.1.5", + "rocambole": ">=0.7 <2.0", + "rocambole-indent": "^2.0.4", + "rocambole-linebreak": "^1.0.0", + "rocambole-node": "~1.0", + "rocambole-token": "^1.1.2", + "rocambole-whitespace": "^1.0.0", + "stdin": "*", + "strip-json-comments": "~0.1.1", + "supports-color": "^1.3.1", + "user-home": "^2.0.0" +======= + "debug": "0.7.4", + "disparity": "2.0.0", + "espree": "2.2.5", + "glob": "5.0.15", + "minimist": "1.2.0", + "mout": "1.1.0", + "npm-run": "2.0.0", + "resolve": "1.7.1", + "rocambole": "0.7.0", + "rocambole-indent": "2.0.4", + "rocambole-linebreak": "1.0.2", + "rocambole-node": "1.0.0", + "rocambole-token": "1.2.1", + "rocambole-whitespace": "1.0.0", + "stdin": "0.0.1", + "strip-json-comments": "0.1.3", + "supports-color": "1.3.1", + "user-home": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "debug": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", + "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=", + "dev": true + }, + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "strip-json-comments": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz", + "integrity": "sha1-Fkxk43Coo8wAyeAbU55WmCPw7lQ=", + "dev": true + }, + "supports-color": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz", + "integrity": "sha1-FXWN8J2P87SswwdTn6vicJXhBC0=", + "dev": true + } + } + }, + "esformatter-eol-last": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esformatter-eol-last/-/esformatter-eol-last-1.0.0.tgz", + "integrity": "sha1-RaeP9GIrHUnkT1a0mQV2amMpDAc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "string.prototype.endswith": "^0.2.0" +======= + "string.prototype.endswith": "0.2.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "esformatter-ignore": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/esformatter-ignore/-/esformatter-ignore-0.1.3.tgz", + "integrity": "sha1-BNO4db+knd4ATMWN9va7w8BWfx4=", + "dev": true + }, + "esformatter-jsx": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/esformatter-jsx/-/esformatter-jsx-2.3.11.tgz", + "integrity": "sha1-QRxE7TJHVK+VquXe2FbVp+78td8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "babel-core": "^5.8.34", + "esformatter-ignore": "^0.1.3", + "extend": "^2.0.1", + "fresh-falafel": "^1.2.0", + "js-beautify": "^1.5.10" + }, + "dependencies": { + "extend": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.2.tgz", + "integrity": "sha512-AgFD4VU+lVLP6vjnlNfF7OeInLTyeyckCNPEsuxz1vi786UuK/nk6ynPuhn/h+Ju9++TQyr5EpLRI14fc1QtTQ==", +======= + "babel-core": "5.8.38", + "esformatter-ignore": "0.1.3", + "extend": "2.0.1", + "fresh-falafel": "1.2.0", + "js-beautify": "1.7.5" + }, + "dependencies": { + "extend": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz", + "integrity": "sha1-HugBBonnOV/5RIJByYZSvHWagmA=", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "esformatter-literal-notation": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esformatter-literal-notation/-/esformatter-literal-notation-1.0.1.tgz", + "integrity": "sha1-cQ57QgF1/j9+WvrVu60ykQOELi8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "rocambole": "^0.3.6", + "rocambole-token": "^1.2.1" +======= + "rocambole": "0.3.6", + "rocambole-token": "1.2.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "esprima": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", + "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=", + "dev": true + }, + "rocambole": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/rocambole/-/rocambole-0.3.6.tgz", + "integrity": "sha1-Teu/WUMUS8e2AG2Vvo+swLdDUqc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "esprima": "~1.0" +======= + "esprima": "1.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "esformatter-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esformatter-parser/-/esformatter-parser-1.0.0.tgz", + "integrity": "sha1-CFQHLQSHU57TnK442KVDLBfsEdM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "acorn-to-esprima": "^2.0.8", + "babel-traverse": "^6.9.0", + "babylon": "^6.8.0", + "rocambole": "^0.7.0" +======= + "acorn-to-esprima": "2.0.8", + "babel-traverse": "6.26.0", + "babylon": "6.18.0", + "rocambole": "0.7.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + } + } + }, + "esformatter-quotes": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esformatter-quotes/-/esformatter-quotes-1.1.0.tgz", + "integrity": "sha1-4ixsRFx/MGBB2BybnlH8psv6yoI=", + "dev": true + }, + "esformatter-semicolon-first": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/esformatter-semicolon-first/-/esformatter-semicolon-first-1.2.0.tgz", + "integrity": "sha1-47US0dTgcxDqvKv1cnfqfIpW4kI=", + "dev": true, + "requires": { +<<<<<<< HEAD + "esformatter-parser": "^1.0", + "rocambole": ">=0.6.0 <2.0", + "rocambole-linebreak": "^1.0.2", + "rocambole-token": "^1.2.1" +======= + "esformatter-parser": "1.0.0", + "rocambole": "0.7.0", + "rocambole-linebreak": "1.0.2", + "rocambole-token": "1.2.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "esformatter-spaced-lined-comment": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esformatter-spaced-lined-comment/-/esformatter-spaced-lined-comment-2.0.1.tgz", + "integrity": "sha1-3F80B/k8KV4eVkRr00RWDaXm3Kw=", + "dev": true + }, + "eslint": { + "version": "1.9.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/eslint/-/eslint-1.9.0.tgz", + "integrity": "sha1-p1qvB+KGUHcu0OcNqizggwebZRQ=", + "dev": true, + "requires": { + "chalk": "^1.0.0", + "concat-stream": "^1.4.6", + "debug": "^2.1.1", + "doctrine": "^0.7.0", + "escape-string-regexp": "^1.0.2", + "escope": "^3.2.0", + "espree": "^2.2.4", + "estraverse": "^4.1.1", + "estraverse-fb": "^1.3.1", + "esutils": "^2.0.2", + "file-entry-cache": "^1.1.1", + "glob": "^5.0.14", + "globals": "^8.11.0", + "handlebars": "^4.0.0", + "inquirer": "^0.11.0", + "is-my-json-valid": "^2.10.0", + "is-resolvable": "^1.0.0", + "js-yaml": "^3.2.5", + "json-stable-stringify": "^1.0.0", + "lodash.clonedeep": "^3.0.1", + "lodash.merge": "^3.3.2", + "lodash.omit": "^3.1.0", + "minimatch": "^3.0.0", + "mkdirp": "^0.5.0", + "object-assign": "^4.0.1", + "optionator": "^0.6.0", + "path-is-absolute": "^1.0.0", + "path-is-inside": "^1.0.1", + "shelljs": "^0.5.3", + "strip-json-comments": "~1.0.1", + "text-table": "~0.2.0", + "to-double-quotes": "^2.0.0", + "to-single-quotes": "^2.0.0", + "user-home": "^2.0.0", + "xml-escape": "~1.0.0" + }, + "dependencies": { + "async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "^4.17.10" + } + }, + "commander": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "dev": true, + "optional": true + }, + "handlebars": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz", + "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==", + "dev": true, + "requires": { + "async": "^2.5.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + } + }, + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true +======= + "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.9.0.tgz", + "integrity": "sha1-p1qvB+KGUHcu0OcNqizggwebZRQ=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "concat-stream": "1.6.0", + "debug": "2.6.9", + "doctrine": "0.7.2", + "escape-string-regexp": "1.0.5", + "escope": "3.6.0", + "espree": "2.2.5", + "estraverse": "4.2.0", + "estraverse-fb": "1.3.2", + "esutils": "2.0.2", + "file-entry-cache": "1.3.1", + "glob": "5.0.15", + "globals": "8.18.0", + "handlebars": "4.0.11", + "inquirer": "0.11.4", + "is-my-json-valid": "2.17.2", + "is-resolvable": "1.1.0", + "js-yaml": "3.11.0", + "json-stable-stringify": "1.0.1", + "lodash.clonedeep": "3.0.2", + "lodash.merge": "3.3.2", + "lodash.omit": "3.1.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.0", + "object-assign": "4.1.1", + "optionator": "0.6.0", + "path-is-absolute": "1.0.1", + "path-is-inside": "1.0.2", + "shelljs": "0.5.3", + "strip-json-comments": "1.0.4", + "text-table": "0.2.0", + "to-double-quotes": "2.0.0", + "to-single-quotes": "2.0.1", + "user-home": "2.0.0", + "xml-escape": "1.0.0" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "strip-json-comments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", + "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=", + "dev": true + }, + "uglify-js": { +<<<<<<< HEAD + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", + "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "dev": true, + "optional": true, + "requires": { + "commander": "~2.17.1", + "source-map": "~0.6.1" +======= + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + } +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "eslint-config-standard": { + "version": "4.4.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-4.4.0.tgz", +======= + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-4.4.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-wSl0nhmZ4M+GEHeyddnFHc2XzXU=", + "dev": true + }, + "eslint-config-standard-react": { + "version": "1.2.1", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/eslint-config-standard-react/-/eslint-config-standard-react-1.2.1.tgz", +======= + "resolved": "https://registry.npmjs.org/eslint-config-standard-react/-/eslint-config-standard-react-1.2.1.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-7QRf2yKzoP4LsL1EnPO/vq7etbM=", + "dev": true + }, + "eslint-plugin-react": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-3.16.1.tgz", + "integrity": "sha1-Ji2Wt318SkKvgJpzwOUnpYYSKTw=", + "dev": true + }, + "eslint-plugin-standard": { + "version": "1.3.3", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-1.3.3.tgz", +======= + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-1.3.3.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-owhUUVI0MedvQJxwy4+U4yvw7H8=", + "dev": true + }, + "espree": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz", + "integrity": "sha1-32kbkxCIlAKuspzAZnCMVmkLhUs=", + "dev": true + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { +<<<<<<< HEAD + "estraverse": "^4.1.0" +======= + "estraverse": "4.2.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "estraverse-fb": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz", + "integrity": "sha1-0yOky15awzHOoDNBOpJT4WQ+B8Q=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true, + "requires": { +<<<<<<< HEAD + "d": "1", + "es5-ext": "~0.10.14" +======= + "d": "1.0.0", + "es5-ext": "0.10.42" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "exit-hook": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", + "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", + "dev": true + }, + "extend": { +<<<<<<< HEAD + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extract-zip": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", + "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "dev": true, + "requires": { + "concat-stream": "1.6.2", + "debug": "2.6.9", + "mkdirp": "0.5.1", +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extract-zip": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz", + "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=", + "dev": true, + "requires": { + "concat-stream": "1.6.0", + "debug": "2.6.9", + "mkdirp": "0.5.0", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "yauzl": "2.4.1" + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "fast-levenshtein": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", + "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=", + "dev": true + }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "pend": "~1.2.0" +======= + "pend": "1.2.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" +======= + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "file-entry-cache": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.3.1.tgz", + "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=", + "dev": true, + "requires": { +<<<<<<< HEAD + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" +======= + "flat-cache": "1.3.0", + "object-assign": "4.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "find-root": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-0.1.2.tgz", + "integrity": "sha1-mNImfP8ZFsyvJ0OzoO6oHXnX3NE=", + "dev": true + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" +======= + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "flat-cache": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "circular-json": "^0.3.1", + "del": "^2.0.2", + "graceful-fs": "^4.1.2", + "write": "^0.2.1" +======= + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "requires": { +<<<<<<< HEAD + "asynckit": "^0.4.0", + "combined-stream": "1.0.6", + "mime-types": "^2.1.12" + }, + "dependencies": { + "combined-stream": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "requires": { + "delayed-stream": "~1.0.0" + } + } +======= + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "fresh-falafel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fresh-falafel/-/fresh-falafel-1.2.0.tgz", + "integrity": "sha1-WWbe6V+zXSopsS0vJRaLFyJeS2w=", + "dev": true, + "requires": { +<<<<<<< HEAD + "acorn": "^1.0.3", + "foreach": "^2.0.5", + "isarray": "0.0.1", + "object-keys": "^1.0.6" +======= + "acorn": "1.2.2", + "foreach": "2.0.5", + "isarray": "0.0.1", + "object-keys": "1.0.11" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "acorn": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz", + "integrity": "sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ=", + "dev": true + }, + "object-keys": { +<<<<<<< HEAD + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", + "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", +======= + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "fs-extra": { + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", + "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" +======= + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "fs-readdir-recursive": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz", + "integrity": "sha1-MVtPuMHKW4xH3v7zGdBz2tNWgFk=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "generate-function": { +<<<<<<< HEAD + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", + "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==", + "dev": true, + "requires": { + "is-property": "^1.0.2" + } +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", + "dev": true +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "generate-object-property": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-property": "^1.0.0" +======= + "is-property": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "get-package-info": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", + "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "bluebird": "^3.1.1", + "debug": "^2.2.0", + "lodash.get": "^4.0.0", + "read-pkg-up": "^2.0.0" +======= + "bluebird": "3.5.1", + "debug": "2.6.9", + "lodash.get": "4.4.2", + "read-pkg-up": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { +<<<<<<< HEAD + "locate-path": "^2.0.0" +======= + "locate-path": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "load-json-file": { + "version": "2.0.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" +======= + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "pify": "^2.0.0" +======= + "pify": "2.3.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" +======= + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" +======= + "find-up": "2.1.0", + "read-pkg": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { +<<<<<<< HEAD + "assert-plus": "^1.0.0" +======= + "assert-plus": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "requires": { +<<<<<<< HEAD + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" +======= + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "globals": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz", + "integrity": "sha1-k9SmK9ysOM+vr8R9awNHaMsP/LQ=", + "dev": true + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { +<<<<<<< HEAD + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "dependencies": { + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" +======= + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "handlebars": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz", + "integrity": "sha1-DgllGi8Ps8lJFgWDcQ1VH5Lm0q0=", + "requires": { +<<<<<<< HEAD + "optimist": "^0.6.1", + "source-map": "^0.1.40", + "uglify-js": "~2.3" +======= + "optimist": "0.6.1", + "source-map": "0.1.43", + "uglify-js": "2.3.6" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { +<<<<<<< HEAD + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", + "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", + "requires": { + "ajv": "^5.3.0", + "har-schema": "^2.0.0" +======= + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "ansi-regex": "^2.0.0" + } + }, +======= + "ansi-regex": "2.1.1" + } + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.1", + "sntp": "2.1.0" + } + }, + "hoek": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "home-or-tmp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz", + "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "os-tmpdir": "^1.0.1", + "user-home": "^1.1.1" +======= + "os-tmpdir": "1.0.2", + "user-home": "1.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", + "dev": true + } + } + }, + "home-path": { +<<<<<<< HEAD + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz", + "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==", + "dev": true + }, + "hosted-git-info": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", +======= + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.5.tgz", + "integrity": "sha1-eIspgVsS1Tus9XVkhHbm+QQdEz8=", + "dev": true + }, + "hosted-git-info": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "requires": { +<<<<<<< HEAD + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" +======= + "domelementtype": "1.3.0", + "domhandler": "2.3.0", + "domutils": "1.5.1", + "entities": "1.0.0", + "readable-stream": "1.1.14" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { +<<<<<<< HEAD + "dom-serializer": "0", + "domelementtype": "1" +======= + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" + } + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { +<<<<<<< HEAD + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore": { + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", +======= + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" + } + }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "dev": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "ignore": { + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", + "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "repeating": "^2.0.0" +======= + "repeating": "2.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { +<<<<<<< HEAD + "once": "^1.3.0", + "wrappy": "1" +======= + "once": "1.4.0", + "wrappy": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "inquirer": { + "version": "0.11.4", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz", + "integrity": "sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=", + "dev": true, + "requires": { + "ansi-escapes": "^1.1.0", + "ansi-regex": "^2.0.0", + "chalk": "^1.0.0", + "cli-cursor": "^1.0.1", + "cli-width": "^1.0.1", + "figures": "^1.3.5", + "lodash": "^3.3.1", + "readline2": "^1.0.1", + "run-async": "^0.1.0", + "rx-lite": "^3.1.2", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.0", + "through": "^2.3.6" +======= + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz", + "integrity": "sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=", + "dev": true, + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "1.1.1", + "figures": "1.7.0", + "lodash": "3.10.1", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dev": true, + "requires": { +<<<<<<< HEAD + "loose-envify": "^1.0.0" +======= + "loose-envify": "1.3.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { +<<<<<<< HEAD + "builtin-modules": "^1.0.0" +======= + "builtin-modules": "1.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { +<<<<<<< HEAD + "number-is-nan": "^1.0.0" +======= + "number-is-nan": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { +<<<<<<< HEAD + "number-is-nan": "^1.0.0" +======= + "number-is-nan": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "is-integer": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.7.tgz", + "integrity": "sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-finite": "^1.0.0" +======= + "is-finite": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "is-my-ip-valid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", + "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", + "dev": true + }, + "is-my-json-valid": { +<<<<<<< HEAD + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz", + "integrity": "sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==", + "dev": true, + "requires": { + "generate-function": "^2.0.0", + "generate-object-property": "^1.1.0", + "is-my-ip-valid": "^1.0.0", + "jsonpointer": "^4.0.0", + "xtend": "^4.0.0" +======= + "version": "2.17.2", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", + "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", + "dev": true, + "requires": { + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "is-my-ip-valid": "1.0.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + } + } + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-path-inside": "^1.0.0" +======= + "is-path-inside": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "path-is-inside": "^1.0.1" +======= + "path-is-inside": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", + "dev": true + }, + "is-resolvable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "isbinaryfile": { +<<<<<<< HEAD + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", + "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", + "dev": true, + "requires": { + "buffer-alloc": "^1.2.0" + } +======= + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", + "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", + "dev": true +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "js-beautify": { +<<<<<<< HEAD + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.6.tgz", + "integrity": "sha512-TYDZa+lg8vEC5U0OmGQEEwiZ0XFBfvZAUeNOtqflLe+woKuIqF4JzlsBx/C1KVYW5lUewZy2ODL4Obq6sH7a4Q==", + "dev": true, + "requires": { + "config-chain": "~1.1.5", + "editorconfig": "^0.15.0", + "mkdirp": "~0.5.0", + "nopt": "~4.0.1" + }, + "dependencies": { + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "dev": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + } +======= + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz", + "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==", + "dev": true, + "requires": { + "config-chain": "1.1.11", + "editorconfig": "0.13.3", + "mkdirp": "0.5.0", + "nopt": "3.0.6" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "js-tokens": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz", + "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=", + "dev": true + }, + "js-yaml": { +<<<<<<< HEAD + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", + "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", +======= + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", + "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", + "dev": true, + "requires": { + "argparse": "1.0.10", + "esprima": "4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "jsonify": "~0.0.0" +======= + "jsonify": "0.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "json5": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz", + "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=", + "dev": true + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.6" +======= + "graceful-fs": "4.1.11" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsonpointer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-buffer": "^1.1.5" +======= + "is-buffer": "1.1.6" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.9" +======= + "graceful-fs": "4.1.11" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "invert-kv": "^1.0.0" +======= + "invert-kv": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "leven": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz", + "integrity": "sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=", + "dev": true + }, + "levn": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", + "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", + "dev": true, + "requires": { +<<<<<<< HEAD + "prelude-ls": "~1.1.0", + "type-check": "~0.3.1" +======= + "prelude-ls": "1.1.2", + "type-check": "0.3.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "load-json-file": { + "version": "1.1.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" +======= + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" +======= + "p-locate": "2.0.0", + "path-exists": "3.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "lodash._arraycopy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz", + "integrity": "sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE=", + "dev": true + }, + "lodash._arrayeach": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz", + "integrity": "sha1-urFWsqkNPxu9XGU0AzSeXlkz754=", + "dev": true + }, + "lodash._arraymap": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz", + "integrity": "sha1-Go/Q9MDfS2HeoHbXF83Jfwo8PmY=", + "dev": true + }, + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._basecopy": "^3.0.0", + "lodash.keys": "^3.0.0" +======= + "lodash._basecopy": "3.0.1", + "lodash.keys": "3.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash._baseclone": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz", + "integrity": "sha1-MDUZv2OT/n5C802LYw73eU41Qrc=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._arraycopy": "^3.0.0", + "lodash._arrayeach": "^3.0.0", + "lodash._baseassign": "^3.0.0", + "lodash._basefor": "^3.0.0", + "lodash.isarray": "^3.0.0", + "lodash.keys": "^3.0.0" +======= + "lodash._arraycopy": "3.0.0", + "lodash._arrayeach": "3.0.0", + "lodash._baseassign": "3.2.0", + "lodash._basefor": "3.0.3", + "lodash.isarray": "3.0.4", + "lodash.keys": "3.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash._basedifference": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz", + "integrity": "sha1-8sIEKWwqeOArOJCBtu3KyTPPYpw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._baseindexof": "^3.0.0", + "lodash._cacheindexof": "^3.0.0", + "lodash._createcache": "^3.0.0" +======= + "lodash._baseindexof": "3.1.0", + "lodash._cacheindexof": "3.0.2", + "lodash._createcache": "3.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash._baseflatten": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz", + "integrity": "sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" +======= + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash._basefor": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz", + "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI=", + "dev": true + }, + "lodash._baseindexof": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz", + "integrity": "sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=", + "dev": true + }, + "lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", + "dev": true + }, + "lodash._cacheindexof": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz", + "integrity": "sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=", + "dev": true + }, + "lodash._createassigner": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", + "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._bindcallback": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash.restparam": "^3.0.0" +======= + "lodash._bindcallback": "3.0.1", + "lodash._isiterateecall": "3.0.9", + "lodash.restparam": "3.6.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash._createcache": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz", + "integrity": "sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._getnative": "^3.0.0" +======= + "lodash._getnative": "3.9.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + }, + "lodash._pickbyarray": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz", + "integrity": "sha1-H4mNlgfrVgsOFnOEt3x8bRCKpMU=", + "dev": true + }, + "lodash._pickbycallback": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz", + "integrity": "sha1-/2G5oBens699MObFPeKK+hm4dQo=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._basefor": "^3.0.0", + "lodash.keysin": "^3.0.0" +======= + "lodash._basefor": "3.0.3", + "lodash.keysin": "3.0.8" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.clonedeep": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz", + "integrity": "sha1-oKHkDYKl6on/WxR7hETtY9koJ9s=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._baseclone": "^3.0.0", + "lodash._bindcallback": "^3.0.0" +======= + "lodash._baseclone": "3.3.0", + "lodash._bindcallback": "3.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true + }, + "lodash.isplainobject": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz", + "integrity": "sha1-moI4rhayAEMpYM1zRlEtASP79MU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._basefor": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.keysin": "^3.0.0" +======= + "lodash._basefor": "3.0.3", + "lodash.isarguments": "3.1.0", + "lodash.keysin": "3.0.8" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.istypedarray": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz", + "integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=", + "dev": true + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" +======= + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.keysin": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz", + "integrity": "sha1-IsRJPrvtsUJ5YqVLRFssinZ/tH8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" +======= + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.merge": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz", + "integrity": "sha1-DZDZPtY3sYeEN7s+IWASYNev6ZQ=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._arraycopy": "^3.0.0", + "lodash._arrayeach": "^3.0.0", + "lodash._createassigner": "^3.0.0", + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0", + "lodash.isplainobject": "^3.0.0", + "lodash.istypedarray": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.keysin": "^3.0.0", + "lodash.toplainobject": "^3.0.0" +======= + "lodash._arraycopy": "3.0.0", + "lodash._arrayeach": "3.0.0", + "lodash._createassigner": "3.1.1", + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4", + "lodash.isplainobject": "3.2.0", + "lodash.istypedarray": "3.0.6", + "lodash.keys": "3.1.2", + "lodash.keysin": "3.0.8", + "lodash.toplainobject": "3.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.omit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz", + "integrity": "sha1-iX/jguZBPZrJfGH3jtHgV6AK+fM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._arraymap": "^3.0.0", + "lodash._basedifference": "^3.0.0", + "lodash._baseflatten": "^3.0.0", + "lodash._bindcallback": "^3.0.0", + "lodash._pickbyarray": "^3.0.0", + "lodash._pickbycallback": "^3.0.0", + "lodash.keysin": "^3.0.0", + "lodash.restparam": "^3.0.0" +======= + "lodash._arraymap": "3.0.0", + "lodash._basedifference": "3.0.3", + "lodash._baseflatten": "3.1.4", + "lodash._bindcallback": "3.0.1", + "lodash._pickbyarray": "3.0.2", + "lodash._pickbycallback": "3.0.0", + "lodash.keysin": "3.0.8", + "lodash.restparam": "3.6.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", + "dev": true + }, + "lodash.toplainobject": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz", + "integrity": "sha1-KHkK2ULSk9eKpmOgfs9/UsoEGY0=", + "dev": true, + "requires": { +<<<<<<< HEAD + "lodash._basecopy": "^3.0.0", + "lodash.keysin": "^3.0.0" +======= + "lodash._basecopy": "3.0.1", + "lodash.keysin": "3.0.8" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "loose-envify": { +<<<<<<< HEAD + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "dependencies": { + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", +======= + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, + "requires": { + "js-tokens": "3.0.2" + }, + "dependencies": { + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + } + } + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + } + }, + "lru-cache": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", + "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" +======= + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lru-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", + "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=", + "dev": true, + "requires": { + "pseudomap": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { +<<<<<<< HEAD + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" +======= + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "mime-db": { +<<<<<<< HEAD + "version": "1.36.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz", + "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==" + }, + "mime-types": { + "version": "2.1.20", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", + "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", + "requires": { + "mime-db": "~1.36.0" +======= + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "requires": { + "mime-db": "1.33.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { +<<<<<<< HEAD + "brace-expansion": "^1.1.7" +======= + "brace-expansion": "1.1.11" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "minimist": { + "version": "0.0.10", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "mkdirp": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", + "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } + }, + "mkpath": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz", + "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=", + "dev": true + }, + "mksnapshot": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz", + "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=", + "dev": true, + "requires": { + "decompress-zip": "0.3.0", + "fs-extra": "0.26.7", +<<<<<<< HEAD + "request": "^2.79.0" +======= + "request": "2.85.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "fs-extra": { + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz", + "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" +======= + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "mout": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mout/-/mout-1.1.0.tgz", + "integrity": "sha512-XsP0vf4As6BfqglxZqbqQ8SR6KQot2AgxvR0gG+WtUkf90vUXchMOZQtPf/Hml1rEffJupqL/tIrU6EYhsUQjw==", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "multiline": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/multiline/-/multiline-1.0.2.tgz", + "integrity": "sha1-abHyX/B00oKJBPJE3dBrfZbvbJM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "strip-indent": "^1.0.0" +======= + "strip-indent": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true + }, + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { +<<<<<<< HEAD + "abbrev": "1" +======= + "abbrev": "1.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { +<<<<<<< HEAD + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" +======= + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "npm-path": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-1.1.0.tgz", + "integrity": "sha1-BHSuAEGcMn1UcBt88s0F3Ii+EUA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "which": "^1.2.4" +======= + "which": "1.3.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "npm-run": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/npm-run/-/npm-run-2.0.0.tgz", + "integrity": "sha1-KN/ArV4uRv4ISOK9WN3wAue3PBU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "minimist": "^1.1.1", + "npm-path": "^1.0.1", + "npm-which": "^2.0.0", + "serializerr": "^1.0.1", + "spawn-sync": "^1.0.5", + "sync-exec": "^0.5.0" +======= + "minimist": "1.2.0", + "npm-path": "1.1.0", + "npm-which": "2.0.0", + "serializerr": "1.0.3", + "spawn-sync": "1.0.15", + "sync-exec": "0.5.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "npm-which": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-2.0.0.tgz", + "integrity": "sha1-DEaYIWC3gwk2YdHQG9RJbS/qu6w=", + "dev": true, + "requires": { +<<<<<<< HEAD + "commander": "^2.2.0", + "npm-path": "^1.0.0", + "which": "^1.0.5" +======= + "commander": "2.15.1", + "npm-path": "1.1.0", + "which": "1.3.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "requires": { +<<<<<<< HEAD + "boolbase": "~1.0.0" +======= + "boolbase": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "nugget": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz", + "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.1.3", + "minimist": "^1.1.0", + "pretty-bytes": "^1.0.2", + "progress-stream": "^1.1.0", + "request": "^2.45.0", + "single-line-log": "^1.1.2", +======= + "debug": "2.6.9", + "minimist": "1.2.0", + "pretty-bytes": "1.0.4", + "progress-stream": "1.2.0", + "request": "2.85.0", + "single-line-log": "1.1.2", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "throttleit": "0.0.2" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, + "oauth-sign": { +<<<<<<< HEAD + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" +======= + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object-keys": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", + "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { +<<<<<<< HEAD + "wrappy": "1" +======= + "wrappy": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "onetime": { + "version": "1.1.0", + "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { +<<<<<<< HEAD + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" +======= + "minimist": "0.0.10", + "wordwrap": "0.0.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "optionator": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.6.0.tgz", + "integrity": "sha1-tj7Lvw4xX61LyYJ7Rdx7pFKE/LY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "deep-is": "~0.1.3", + "fast-levenshtein": "~1.0.6", + "levn": "~0.2.5", + "prelude-ls": "~1.1.1", + "type-check": "~0.3.1", + "wordwrap": "~0.0.2" +======= + "deep-is": "0.1.3", + "fast-levenshtein": "1.0.7", + "levn": "0.2.5", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "0.0.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, + "os-locale": { + "version": "1.4.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, + "requires": { + "lcid": "^1.0.0" +======= + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, + "requires": { + "lcid": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "os-shim": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz", + "integrity": "sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc=", + "dev": true + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true + }, +<<<<<<< HEAD + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, +======= +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "output-file-sync": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", + "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.4", + "mkdirp": "^0.5.1", + "object-assign": "^4.1.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" +======= + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "object-assign": "4.1.1" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + } + } + }, + "p-limit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "dev": true, + "requires": { + "p-try": "1.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { +<<<<<<< HEAD + "p-limit": "^1.1.0" +======= + "p-limit": "1.2.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { +<<<<<<< HEAD + "error-ex": "^1.2.0" +======= + "error-ex": "1.3.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { +<<<<<<< HEAD + "pinkie-promise": "^2.0.0" +======= + "pinkie-promise": "2.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-parse": { +<<<<<<< HEAD + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", +======= + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" +======= + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { +<<<<<<< HEAD + "pinkie": "^2.0.0" +======= + "pinkie": "2.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "pkg-config": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz", + "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug-log": "^1.0.0", + "find-root": "^1.0.0", + "xtend": "^4.0.1" +======= + "debug-log": "1.0.1", + "find-root": "1.1.0", + "xtend": "4.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "find-root": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + } + } + }, + "plist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz", + "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=", + "dev": true, + "requires": { + "base64-js": "1.2.0", + "xmlbuilder": "8.2.2", +<<<<<<< HEAD + "xmldom": "0.1.x" +======= + "xmldom": "0.1.27" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "pretty-bytes": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", + "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", + "dev": true, + "requires": { +<<<<<<< HEAD + "get-stdin": "^4.0.1", + "meow": "^3.1.0" +======= + "get-stdin": "4.0.1", + "meow": "3.7.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "private": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", + "dev": true + }, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "dev": true + }, + "progress-stream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz", + "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=", + "dev": true, + "requires": { +<<<<<<< HEAD + "speedometer": "~0.1.2", + "through2": "~0.2.3" +======= + "speedometer": "0.1.4", + "through2": "0.2.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "dev": true + }, + "protochain": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/protochain/-/protochain-1.0.5.tgz", + "integrity": "sha1-mRxAfpneJkqt+PgVBLXn+ve/omA=", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, +<<<<<<< HEAD + "psl": { + "version": "1.1.29", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz", + "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==" + }, +======= +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", + "dev": true + }, + "qs": { +<<<<<<< HEAD + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" +======= + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + }, + "rc": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", + "dev": true, + "requires": { + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "rcedit": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.9.0.tgz", + "integrity": "sha1-ORDfVzRTmeKwMl9KUZAH+J5V7xw=", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" +======= + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { +<<<<<<< HEAD + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" +======= + "find-up": "1.1.2", + "read-pkg": "1.1.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "readable-stream": { + "version": "1.1.14", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" +======= + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "mute-stream": "0.0.5" + } + }, + "recast": { + "version": "0.10.33", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz", + "integrity": "sha1-lCgI96oBbx+nFCxGHX5XBKqo1pc=", + "dev": true, + "requires": { + "ast-types": "0.8.12", +<<<<<<< HEAD + "esprima-fb": "~15001.1001.0-dev-harmony-fb", + "private": "~0.1.5", + "source-map": "~0.5.0" +======= + "esprima-fb": "15001.1001.0-dev-harmony-fb", + "private": "0.1.8", + "source-map": "0.5.7" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "ast-types": { + "version": "0.8.12", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz", + "integrity": "sha1-oNkOQ1G7iHcWyD/WN+v4GK9K38w=", + "dev": true + }, + "esprima-fb": { + "version": "15001.1001.0-dev-harmony-fb", + "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz", + "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { +<<<<<<< HEAD + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" + } + }, + "regenerate": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", + "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", +======= + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "regenerate": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", + "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "regenerator": { + "version": "0.8.40", + "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz", + "integrity": "sha1-oORXxY69uuV1yfjNdRJ+k3VkNdg=", + "dev": true, + "requires": { +<<<<<<< HEAD + "commoner": "~0.10.3", + "defs": "~1.1.0", + "esprima-fb": "~15001.1001.0-dev-harmony-fb", + "private": "~0.1.5", + "recast": "0.10.33", + "through": "~2.3.8" +======= + "commoner": "0.10.8", + "defs": "1.1.1", + "esprima-fb": "15001.1001.0-dev-harmony-fb", + "private": "0.1.8", + "recast": "0.10.33", + "through": "2.3.8" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "esprima-fb": { + "version": "15001.1001.0-dev-harmony-fb", + "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz", + "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk=", + "dev": true + } + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + }, + "regexpu": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz", + "integrity": "sha1-5TTcmRqeWEYFDJjebX3UpVyeoW0=", + "dev": true, + "requires": { +<<<<<<< HEAD + "esprima": "^2.6.0", + "recast": "^0.10.10", + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" +======= + "esprima": "2.7.3", + "recast": "0.10.33", + "regenerate": "1.3.3", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + } + } + }, + "regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "jsesc": "~0.5.0" +======= + "jsesc": "0.5.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-finite": "^1.0.0" + } + }, + "request": { + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + } + }, + "resolve": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", + "dev": true, + "requires": { + "path-parse": "^1.0.5" +======= + "is-finite": "1.0.2" + } + }, + "request": { + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.7.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "stringstream": "0.0.5", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, + "resolve": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", + "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "dev": true, + "requires": { +<<<<<<< HEAD + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" +======= + "exit-hook": "1.1.1", + "onetime": "1.1.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "align-text": "^0.1.1" +======= + "align-text": "0.1.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "dev": true, + "requires": { +<<<<<<< HEAD + "glob": "^7.0.5" + }, + "dependencies": { + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" +======= + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "rocambole": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/rocambole/-/rocambole-0.7.0.tgz", + "integrity": "sha1-9seVBVF9xCtvuECEK4uVOw+WhYU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "esprima": "^2.1" +======= + "esprima": "2.7.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + } + } + }, + "rocambole-indent": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/rocambole-indent/-/rocambole-indent-2.0.4.tgz", + "integrity": "sha1-oYokl3ygQAuGHapGMehh3LUtCFw=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.1.3", + "mout": "^0.11.0", + "rocambole-token": "^1.2.1" +======= + "debug": "2.6.9", + "mout": "0.11.1", + "rocambole-token": "1.2.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "mout": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/mout/-/mout-0.11.1.tgz", + "integrity": "sha1-ujYR318OWx/7/QEWa48C0fX6K5k=", + "dev": true + } + } + }, + "rocambole-linebreak": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/rocambole-linebreak/-/rocambole-linebreak-1.0.2.tgz", + "integrity": "sha1-A2IVFbQ7RyHJflocG8paA2Y2jy8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.1.3", + "rocambole-token": "^1.2.1", + "semver": "^4.3.1" +======= + "debug": "2.6.9", + "rocambole-token": "1.2.1", + "semver": "4.3.6" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "dev": true + } + } + }, + "rocambole-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rocambole-node/-/rocambole-node-1.0.0.tgz", + "integrity": "sha1-21tJ3nQHsAgN1RSHLyjjk9D3/z8=", + "dev": true + }, + "rocambole-token": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rocambole-token/-/rocambole-token-1.2.1.tgz", + "integrity": "sha1-x4XfdCjcPLJ614lwR71SOMwHDTU=", + "dev": true + }, + "rocambole-whitespace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rocambole-whitespace/-/rocambole-whitespace-1.0.0.tgz", + "integrity": "sha1-YzMJSSVrKZQfWbGQRZ+ZnGsdO/k=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.1.3", + "repeat-string": "^1.5.0", + "rocambole-token": "^1.2.1" +======= + "debug": "2.6.9", + "repeat-string": "1.6.1", + "rocambole-token": "1.2.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "dev": true, + "requires": { +<<<<<<< HEAD + "once": "^1.3.0" +======= + "once": "1.4.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true + }, + "run-series": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz", + "integrity": "sha512-+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg==", + "dev": true + }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "dev": true + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", +<<<<<<< HEAD + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" +======= + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "sanitize-filename": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz", + "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=", + "dev": true, + "requires": { +<<<<<<< HEAD + "truncate-utf8-bytes": "^1.0.0" + } + }, + "semver": { + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz", + "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==", +======= + "truncate-utf8-bytes": "1.0.2" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "serializerr": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/serializerr/-/serializerr-1.0.3.tgz", + "integrity": "sha1-EtTFqhw/+49tHcXzlaqUVVacP5E=", + "dev": true, + "requires": { +<<<<<<< HEAD + "protochain": "^1.0.5" +======= + "protochain": "1.0.5" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "shelljs": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", + "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=", + "dev": true + }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, + "simple-fmt": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz", + "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=", + "dev": true + }, + "simple-is": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz", + "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=", + "dev": true + }, + "single-line-log": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz", + "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=", + "dev": true, + "requires": { +<<<<<<< HEAD + "string-width": "^1.0.1" +======= + "string-width": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "dev": true + }, +<<<<<<< HEAD +======= + "sntp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "requires": { + "hoek": "4.2.1" + } + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "requires": { +<<<<<<< HEAD + "amdefine": ">=0.0.4" +======= + "amdefine": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "source-map-support": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz", + "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=", + "dev": true, + "requires": { + "source-map": "0.1.32" + }, + "dependencies": { + "source-map": { + "version": "0.1.32", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", + "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "amdefine": ">=0.0.4" +======= + "amdefine": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "spawn-sync": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz", + "integrity": "sha1-sAeZVX63+wyDdsKdROih6mfldHY=", + "dev": true, + "requires": { +<<<<<<< HEAD + "concat-stream": "^1.4.7", + "os-shim": "^0.1.2" +======= + "concat-stream": "1.6.0", + "os-shim": "0.1.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "spdx-correct": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", + "dev": true, + "requires": { +<<<<<<< HEAD + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" +======= + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { +<<<<<<< HEAD + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz", + "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==", +======= + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "speedometer": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz", + "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "sshpk": { +<<<<<<< HEAD + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", + "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" +======= + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "stable": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", + "dev": true + }, + "standard": { + "version": "5.4.1", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/standard/-/standard-5.4.1.tgz", +======= + "resolved": "https://registry.npmjs.org/standard/-/standard-5.4.1.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-LwE5ErJ5Tdswu6qJ3BP7OpkMxys=", + "dev": true, + "requires": { + "eslint-config-standard": "4.4.0", + "eslint-config-standard-react": "1.2.1", +<<<<<<< HEAD + "eslint-plugin-react": "^3.9.0", + "eslint-plugin-standard": "^1.3.1", + "standard-engine": "^2.0.4", + "standard-format": "^1.3.3" +======= + "eslint-plugin-react": "3.16.1", + "eslint-plugin-standard": "1.3.3", + "standard-engine": "2.2.5", + "standard-format": "1.6.10" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "standard-engine": { + "version": "2.2.5", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/standard-engine/-/standard-engine-2.2.5.tgz", + "integrity": "sha1-ornUQZ9kiiIbjReCP7dFQG83w04=", + "dev": true, + "requires": { + "defaults": "^1.0.2", + "deglob": "^1.0.0", + "dezalgo": "^1.0.2", + "eslint": "1.9.0", + "find-root": "^0.1.1", + "get-stdin": "^4.0.1", + "minimist": "^1.1.0", + "multiline": "^1.0.2", + "pkg-config": "^1.0.1", + "xtend": "^4.0.0" +======= + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-2.2.5.tgz", + "integrity": "sha1-ornUQZ9kiiIbjReCP7dFQG83w04=", + "dev": true, + "requires": { + "defaults": "1.0.3", + "deglob": "1.1.2", + "dezalgo": "1.0.3", + "eslint": "1.9.0", + "find-root": "0.1.2", + "get-stdin": "4.0.1", + "minimist": "1.2.0", + "multiline": "1.0.2", + "pkg-config": "1.1.1", + "xtend": "4.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + } + } + }, + "standard-format": { + "version": "1.6.10", + "resolved": "https://registry.npmjs.org/standard-format/-/standard-format-1.6.10.tgz", + "integrity": "sha1-sYPI+DfI05OHmPPQlD5dgHoboD8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "deglob": "^1.0.0", + "esformatter": "^0.8.1", + "esformatter-eol-last": "^1.0.0", + "esformatter-jsx": "^2.0.11", + "esformatter-literal-notation": "^1.0.0", + "esformatter-quotes": "^1.0.0", + "esformatter-semicolon-first": "^1.1.0", + "esformatter-spaced-lined-comment": "^2.0.0", + "minimist": "^1.1.0", +======= + "deglob": "1.1.2", + "esformatter": "0.8.2", + "esformatter-eol-last": "1.0.0", + "esformatter-jsx": "2.3.11", + "esformatter-literal-notation": "1.0.1", + "esformatter-quotes": "1.1.0", + "esformatter-semicolon-first": "1.2.0", + "esformatter-spaced-lined-comment": "2.0.1", + "minimist": "1.2.0", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "stdin": "0.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "stdin": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz", + "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { +<<<<<<< HEAD + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "string.prototype.endswith": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/string.prototype.endswith/-/string.prototype.endswith-0.2.0.tgz", + "integrity": "sha1-oZwg3uUamHd+mkfhDwm+OTubunU=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "stringmap": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz", + "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=", + "dev": true + }, + "stringset": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz", + "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=", + "dev": true + }, +<<<<<<< HEAD +======= + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "ansi-regex": "^2.0.0" +======= + "ansi-regex": "2.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "is-utf8": "^0.2.0" +======= + "is-utf8": "0.2.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { +<<<<<<< HEAD + "get-stdin": "^4.0.1" +======= + "get-stdin": "4.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "sumchecker": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz", + "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", + "dev": true, + "requires": { +<<<<<<< HEAD + "debug": "^2.2.0", + "es6-promise": "^4.0.5" +======= + "debug": "2.6.9", + "es6-promise": "4.2.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "sync-exec": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/sync-exec/-/sync-exec-0.5.0.tgz", + "integrity": "sha1-P3JY5KW6FyRTgZCfpqb2z1BuFmE=", + "dev": true + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "throttleit": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", + "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=", + "dev": true + }, + "through": { + "version": "2.3.8", +<<<<<<< HEAD + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", +======= + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "through2": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", + "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "readable-stream": "~1.1.9", + "xtend": "~2.1.1" +======= + "readable-stream": "1.1.14", + "xtend": "2.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "tmp": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", + "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=", + "dev": true, + "requires": { +<<<<<<< HEAD + "os-tmpdir": "~1.0.1" +======= + "os-tmpdir": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "to-double-quotes": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-2.0.0.tgz", + "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=", + "dev": true + }, + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + }, + "to-single-quotes": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz", + "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=", + "dev": true + }, + "touch": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz", + "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=", + "dev": true, + "requires": { +<<<<<<< HEAD + "nopt": "~1.0.10" +======= + "nopt": "1.0.10" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", + "dev": true, + "requires": { +<<<<<<< HEAD + "abbrev": "1" +======= + "abbrev": "1.1.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, + "tough-cookie": { +<<<<<<< HEAD + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "requires": { + "psl": "^1.1.24", + "punycode": "^1.4.1" +======= + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "1.4.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "traverse": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", + "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", + "dev": true + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "dev": true + }, + "truncate-utf8-bytes": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "dev": true, + "requires": { +<<<<<<< HEAD + "utf8-byte-length": "^1.0.1" +======= + "utf8-byte-length": "1.0.4" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "try-resolve": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz", + "integrity": "sha1-z95vq9ctY+V5fPqrhzq76OcA6RI=", + "dev": true + }, + "tryor": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz", + "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { +<<<<<<< HEAD + "safe-buffer": "^5.0.1" +======= + "safe-buffer": "5.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { +<<<<<<< HEAD + "prelude-ls": "~1.1.2" +======= + "prelude-ls": "1.1.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, + "uglify-js": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz", + "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=", + "optional": true, + "requires": { +<<<<<<< HEAD + "async": "~0.2.6", + "optimist": "~0.3.5", + "source-map": "~0.1.7" +======= + "async": "0.2.10", + "optimist": "0.3.7", + "source-map": "0.1.43" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "optional": true, + "requires": { +<<<<<<< HEAD + "wordwrap": "~0.0.2" +======= + "wordwrap": "0.0.3" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } + }, +<<<<<<< HEAD +======= + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true, + "optional": true + }, +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "uniq": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "dev": true + }, + "universalify": { +<<<<<<< HEAD + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", +======= + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + "dev": true + }, + "user-home": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", + "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", + "dev": true, + "requires": { +<<<<<<< HEAD + "os-homedir": "^1.0.0" +======= + "os-homedir": "1.0.2" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "utf8-byte-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", + "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "dev": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "uuid": { +<<<<<<< HEAD + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" +======= + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, + "validate-npm-package-license": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", + "dev": true, + "requires": { + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { +<<<<<<< HEAD + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true +======= + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "dev": true, + "requires": { + "isexe": "2.0.0" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true, + "requires": { +<<<<<<< HEAD + "mkdirp": "^0.5.1" +======= + "mkdirp": "0.5.1" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + } +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "xml-escape": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz", + "integrity": "sha1-AJY9aXsq3wwYXE4E5zF0upsojrI=", + "dev": true + }, + "xmlbuilder": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz", + "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=", + "dev": true + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=", + "dev": true + }, + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { +<<<<<<< HEAD + "object-keys": "~0.4.0" +======= + "object-keys": "0.4.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, +<<<<<<< HEAD + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "yargs": { + "version": "3.27.0", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz", + "integrity": "sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=", + "dev": true, + "requires": { + "camelcase": "^1.2.1", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", + "os-locale": "^1.4.0", + "window-size": "^0.1.2", + "y18n": "^3.2.0" +======= + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", +<<<<<<< HEAD + "dev": true +======= + "dev": true, + "optional": true +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + }, + "yauzl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", + "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "dev": true, + "requires": { +<<<<<<< HEAD + "fd-slicer": "~1.0.1" +======= + "fd-slicer": "1.0.1" +>>>>>>> 9150a96 (Adaptations for the Manchester Codes pre-course) + } + } + } +} diff --git a/package.json b/package.json index 37984dfb08..2f70dabd1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "git-it-electron", - "version": "4.2.2", + "version": "4.3.0", "description": "An open source desktop app for learning Git and GitHub", "keywords": [ "Git", diff --git a/resources/contents/en-US/challenges/1_get_git.html b/resources/contents/en-US/challenges/1_get_git.html index ac18f69769..b7024eada2 100644 --- a/resources/contents/en-US/challenges/1_get_git.html +++ b/resources/contents/en-US/challenges/1_get_git.html @@ -11,39 +11,10 @@

Git

-
-

Install Git

-

We recommend installing Git on your computer by downloading the GitHub - Desktop app. We'll not use the desktop app in Git-it (we're learning terminal!) but it includes Git and is - the easiest way to install Git on all platforms in the same way.

- - - -

Already have Git or not sure? Type git --version in your terminal and if it returns a version number - higher than 1.7.10, you're set! For more information, visit the Git - website.

-
- -
-

Git Software

-

The GitHub Desktop app can do a lot of things with Git but not all, which is why learning the terminal is - important. But once you've got that down, you'll be glad to have the desktop app because it organizes your - project's information more visually, like the GitHub website.

- -

Git on its own isn't like other programs on your computer. You'll likely not see an icon on your desktop, but it - will always be available to you and you'll be able to access it at anytime from your terminal or Git desktop - applications.

-
-

Configure Git

-

Once GitHub Desktop (and therefore Git) is installed, open your terminal. - You can verify that Git is really there by typing:

+

Open your terminal. + You can verify that Git is installed by typing:

git --version

diff --git a/resources/contents/en-US/challenges/2_repository.html b/resources/contents/en-US/challenges/2_repository.html index 9c84dcc4c8..6743e260d2 100644 --- a/resources/contents/en-US/challenges/2_repository.html +++ b/resources/contents/en-US/challenges/2_repository.html @@ -3,7 +3,7 @@
-

Repositories

+

Repositories

A repository is a collection of related items. In our case, when writing software, it is a collection of files related to a software project. You can imagine it as a project folder with all the relevant files inside of it. In fact, that's what it will look like on your computer anyways. Sometimes they're called @@ -19,16 +19,14 @@

Repositories

Using Terminal

Terminal (or Bash) is a way to instruct your computer to do things by typing commands rather than clicking applications with your mouse. You can rename files, open files, create new folders, move between - directories (folders) and more all by running typed commands. You can even use a text editor for code (like Vim) in your terminal and - never have to leave!

+ directories (folders) and more all by running typed commands.

Besides navigating your computer, you can also use programs in Terminal that have a command-line interface (CLI), meaning they can be run with commands in terminal. Git is one of these. The first part of the command lets your computer know you're talking to Git. The parts following that are the commands and the different options you want Git to act on.

-

In Git-it you'll learn a few basic command-line actions (in addition to Git commands) for navigating your +

In this tutorial you'll learn a few basic command-line actions (in addition to Git commands) for navigating your computer; they're described within the steps.

@@ -42,10 +40,16 @@

Create a Repository

In your terminal window, type these commands, one at a time, pressing enter/return after each.

-

First, make a new folder:
Tip: mkdir stands for make directory

- mkdir hello-world +

Firstly, let's make a new folder for all of our projects we'll do on the course:
Tip: mkdir stands for make directory

+ mkdir Projects

Then go into that folder:
Tip: cd stands for change directory

+ cd Projects + +

Make a new folder for the project:

+ mkdir hello-world + +

Then go into that folder:

cd hello-world

Finally, tell Git to initialize (start tracking) the folder you are now in:

@@ -72,3 +76,9 @@

Create a Repository

git init + +
+

Initialising a Git repository in the correct folder

+

One of the most common mistakes among students when first starting out with Git, is to initialise their Git repository (git init) inside their home folder (~) or their Projects folder.

+

Always ensure you only initialize a new repository inside a single project folder so each project has its own repository.

+
diff --git a/resources/contents/en-US/challenges/3_commit_to_it.html b/resources/contents/en-US/challenges/3_commit_to_it.html index 6394e66cb0..61d32783dc 100644 --- a/resources/contents/en-US/challenges/3_commit_to_it.html +++ b/resources/contents/en-US/challenges/3_commit_to_it.html @@ -12,7 +12,7 @@

Commits

Create a New File

Now that you've got a repository started let's add a file to it.

Open your text editor and create a new empty file. Now write a little bit of text, perhaps type "Hello!", and - save the file as 'readme.txt' in the 'hello-world' folder you created in the last challenge.

+ save the file as 'README.md' in the 'hello-world' folder you created in the last challenge.

@@ -29,7 +29,7 @@

Check Status + Add and Commit Changes

Then add the file you just created so that it becomes a part of the changes you will commit (aka save) with Git:

-

git add readme.txt

+

git add README.md

Finally, commit those changes to the repository's history with a short (m) message describing the updates.

@@ -38,7 +38,7 @@

Check Status + Add and Commit Changes

Step: Make More Changes

-

Now add another line to 'readme.txt' and save the file again.

+

Now add another line to 'README.md' and save the file again.

In terminal, you can view the difference between the file now and how it was at your last commit.

diff --git a/resources/contents/en-US/challenges/4_githubbin.html b/resources/contents/en-US/challenges/4_githubbin.html index 06872f9728..401c64fc0d 100644 --- a/resources/contents/en-US/challenges/4_githubbin.html +++ b/resources/contents/en-US/challenges/4_githubbin.html @@ -13,21 +13,13 @@

Working Better, Together

to share. You push your changes to it and pull down changes from others.

-
-

Create a GitHub Account

- -

Visit github.com and sign up for a free account. High - five, welcome!

-
-

Add GitHub username to Git

-

Add your GitHub username to your Git configuration. We'll do this just for the sake of Git-it; it makes it easier - to verify the upcoming challenges. Save it exactly as you created it on GitHub and capitalize where +

Add your GitHub username to your Git configuration. Save it exactly as you created it on GitHub and capitalize where capitalized. Note, you don't need to enter the "<" and ">".

Add your GitHub username to your Git configuration:

- git config --global user.username <USerNamE> + git config --global user.username <UserName>

You can double check what you have set in your Git config by typing:

git config --global user.username @@ -48,6 +40,6 @@

GitHub & Git config usernames do not match

For instance, 'JLord' isn't the same as 'jlord'

To change your username set with Git, just do the same command you did earlier, but with the correct capitalization:

-

git config --global user.username <USerNamE>

+

git config --global user.username <UserName>

When you've made your updates, verify again!

diff --git a/resources/contents/en-US/challenges/5_remote_control.html b/resources/contents/en-US/challenges/5_remote_control.html index b0768833a9..94447ed016 100644 --- a/resources/contents/en-US/challenges/5_remote_control.html +++ b/resources/contents/en-US/challenges/5_remote_control.html @@ -30,7 +30,7 @@

Create a Remote Repository

  • Give it a name that matches your local repository's name, 'hello-world', and a short description.
  • Make it public. This means it'll be listed on your public profile.
    • -
  • Don't initialize with a README because we already have a file, locally, named 'readme.txt'. This is a helper +
  • Don't initialize with a README because we already have a file, locally, named 'README.md'. This is a helper option from GitHub if you hadn't already made it.
  • Leave '.gitignore' and 'license' set to 'none'. We won't use them this tutorial.
    • diff --git a/resources/contents/en-US/pages/index.html b/resources/contents/en-US/pages/index.html index a9f6a56c67..99041df915 100644 --- a/resources/contents/en-US/pages/index.html +++ b/resources/contents/en-US/pages/index.html @@ -45,10 +45,10 @@

    Welcome!

    skills, they are the commands and steps you'll use over and over as in your awesome social coding + version controlled future.

    +

    This application has been adapted for Command Shift. Credit goes to Jessica Lord for the original application.

    +

    But Wait—There's More

    -

    You can also complete Git-it in Traditional Chinese, Japanese, Korean, Portuguese (Brazil) and Ukrainian, - just select the language you want from the menu in the upper left.

    The 'Window' option in the application menu will take you to the Dictionary, On your way!

    Congratulations!

    You finished the challenges and are primed for social coding—so what's next?

     - +
    diff --git a/resources/contents/en-US/pages/resources.html b/resources/contents/en-US/pages/resources.html index b766c42174..03bbfa6eb6 100644 --- a/resources/contents/en-US/pages/resources.html +++ b/resources/contents/en-US/pages/resources.html @@ -1,50 +1,71 @@

    Resources

    -

    To reinforce what you just learned or to try another way, here are suggestions for other guides and tutorials.

    -

    If you're ready to dive into a project, jump to the beginner projects section.

    +

    + To reinforce what you just learned or to try another way, here are suggestions + for other guides and tutorials. +

    +

    + If you're looking for something more practical, jump to the + What Next? section. +

    -

    Interactive Tutorial

    -
      -
    • Try Git (Uses an terminal emulator) by CodeSchool -
      • -
    +

    Interactive Tutorial

    +
      +
    • + Try Git (Uses an + terminal emulator) by CodeSchool +
      • +
    -

    Guides, Books and Cheatsheets

    - - -

    GitHub Desktop

    -

    You likely installed this before you started Git-it but if you didn't, here's the link.

    -

    The GitHub Desktop app lets you do much of what you can do in terminal (though not all) and is a bit easier to - read at times. Personally, I use it to look over anything not small diff I have. Your changes are - really nice to see this way.

    - +

    Guides, Books and Cheatsheets

    +

    What Next?

    -

    Now that you're feeling good because you've got the fundamentals down, here are some beginner project ideas to - keep you going!

    - +

    + Now that you're feeling good because you've got the fundamentals down, here + are some more activities you can try! +

    +
    diff --git a/resources/contents/es-CO/challenges/1_get_git.html b/resources/contents/es-CO/challenges/1_get_git.html index 5cc4834d46..674d465efe 100644 --- a/resources/contents/es-CO/challenges/1_get_git.html +++ b/resources/contents/es-CO/challenges/1_get_git.html @@ -19,7 +19,7 @@

    Instalar Git

    • Para Windows: usa la Git Shell para tu terminal/consola.
      • -
    • Para Mac: Abre GitHub Desktop and desde preferencias, selecciona la instalación de línea de comandos. Usa +
    • Para Mac: Abre GitHub Desktop y, desde preferencias, selecciona la instalación de línea de comandos. Usa la terminal/consola de mac cómo tal.
    diff --git a/resources/contents/es-CO/pages/index.html b/resources/contents/es-CO/pages/index.html index 5fe16285a9..1d81ac2176 100644 --- a/resources/contents/es-CO/pages/index.html +++ b/resources/contents/es-CO/pages/index.html @@ -47,7 +47,7 @@

    Bienvenido!

    Pero espera, hay más!

    -

    Puedes hacer los retos de Git-it en Mandarín (Chino), Japonés, Coreano, Portugués (Brazil), Inglés (Estados Unidos), Español (Colombia) y Ucraniano, +

    Puedes hacer los retos de Git-it en Mandarín (Chino), Japonés, Coreano, Portugués (Brazil), Inglés (Estados Unidos), Español (Colombia), Español (España) y Ucraniano, sólo selecciona el lenguaje que quieras desde el menú arriba a la izquierda.

    La opción 'Ventana' (window) en el menú de la aplicación te llevará a +

    Enviar una solicitud de aceptación de tus cambios (Pull Request) al repositorio original Patchwork.

    +
    + +
    +

    Pull Requests

    +

    Habitualmente, cuando haces cambios y mejoras a un proyecto que has bifurcado, vas a querer enviar esos cambios a los + encargados de mantener el repositorio original y solicitarles (request) que tiren (pull) de esos cambios + al original, para que aquellos que lo usan se puedan beneficiar de las actualizaciones. Eso es un pull request.

    + +

    Queremos añadirte a la lista de personas que finalizaron este taller, así que crea un pull request para añadir + tu archivo con tu usuario al repositorio original: github.com/jlord/patchwork. +

    + + Una ilustración mostrando dos opciones. La última opción contiene más letras del alfabeto que la primera y está pidiéndole que acepte su trabajo de manera que el alfabeto esté completo. +
    + +
    +

    Crear un pull request

    +

    Visita el repositorio original que bifurcaste en GitHub, en este caso http://github.com/jlord/patchwork. +

    + +

    Muchas de las veces, GitHub detectará si has empujado (push) una branch a un fork y lo mostrará en la parte superior de la página del repositorio original. + Si puedes ver tu rama 'add-username', puedes hacer clic en 'Create a Pull Request' (crear un pull request) desde ahí mismo. Si no:

    + +
      +
    • Haz clic en el botón verde que dice 'New Pull Request'.
      • +
    • Selecciona la rama que tiene los cambios que quieres enviar. Debería ser la que se llama 'add-yourusername'.
      • +
    + +

    Ahora verás una página con los detalles que están en proceso de ser enviados. Esta página muestra + los commits con los cambios, en el apartado diff, asociando el pull request y comparándolo con la rama 'gh-pages' + del original.

    + +

    Si el repositorio original tiene documentación de contribución, GitHub lo enlazará. Esta es + la documentación en la que los propietarios del repositorio describen la que consideran la mejor manera de hacer contribuciones a ese proyecto. ¡Es de gran ayuda leer si + quisieras saber si tus cambios serán aceptados!

    + +

    Si todo en la página se ve bien y es lo que esperabas:

    + +
      +
    • Haz clic en 'Create pull request'
      • +
    • Añade un título y una descripción a los cambios que has sugerido al autor del repositorio original para ser incorporados.
      • +
    • Haz clic en 'Send pull request'!
      • +
    + +

    ¡Bingo! Enviaste un pull request — tómate unos segundos para disfrutar el momento. + +

    Si todo está bien con tu pull request, será fusionado en unos momentos en este caso. Si no está automáticamente fusionado después de unos pocos minutos, + entonces tendrás algunos comentarios que te hizo @reporobot explicando por qué no los pudo fusionar (merge). Si es el + caso, cierra tu pull request en GitHub, haz los cambios necesarios en tu rama, vuelve a enviar los cambios a tu fork + y reabre (esto avisará a @reporobot para que revise nuevamente) tu pull request.

    +
    + +{{{ verify_button }}} diff --git a/resources/contents/es-ES/challenges/11_merge_tada.html b/resources/contents/es-ES/challenges/11_merge_tada.html new file mode 100644 index 0000000000..05c54271e2 --- /dev/null +++ b/resources/contents/es-ES/challenges/11_merge_tada.html @@ -0,0 +1,64 @@ +
    +

    Fusiona (merge) tu rama (branch) localmente, borra la rama y tira (pull) desde upstream.

    +
    + +
    +

    Limpieza

    + +

    Una vez que ya no necesitas las ramas puedes eliminarlas local y remotamente. Esto ayuda a que no + termines con una pila de ramas viejas.

    +
    + +
    +

    Fusionar (merge) localmente

    +

    ¡Tu pull request ha sido fusionado! Tu rama fue fusionada en la rama 'gh-pages' de el repositorio original en GitHub. + Puedes fusionar la rama localmente, también.

    + +

    Primero, cámbiate a la rama a la cual quieres fusionarle los cambios. En este caso, la rama 'gh-pages'.

    +

    git checkout gh-pages

    + +

    Ahora dile a Git desde qué rama quieres traer los cambios. En este caso, tu rama que empieza con "add-".

    +

    git merge <NOMBREDELABRANCH>

    + +

    Ordena el repositorio eliminando la branch sobre la que has trabajado. Ahora que has fusionado los cambios que hiciste ahí, ya no te hace falta.

    +

    git branch -d <NOMBREDELABRANCH>

    + +

    También puedes eliminar la rama de tu remoto en GitHub:

    +

    git push <NOMBREDELREMOTO> --delete <NOMBREDELABRANCH>

    +
    + +
    +

    Tira (pull) desde upstream

    +

    Y por último, pero no menos importante, el repositorio original ha cambiado desde que tu pull request fue fusionado, ¡añadió tu nombre al sitio web! Si tiras de esos cambios desde upstream, estarás al día y tendrás esa versión también. Puedes + ver el sitio online en: tunombredeusuario.github.io/patchwork.

    + +

    Para tirar desde el original upstream:

    +

    git pull upstream gh-pages

    +
    + +
    +

    ¡Enhorabuena!

    +

    ¡Has creado repositorios, repositorios remotos, trabajado con un colaborador, empujado (push), tirado (pull) y te has unido millones + de personas desarrollando y enriqueciendo el código abierto!

    + +

    Visita jlord.github.io/patchwork para ver tu nombre + incorporado. ¿Quieres continuar? Revisa la sección Qué más + en la página de recursos de esta aplicación.

    +
    + +{{{ verify_directory_button }}} + +
    +
      +
    • Fusiona una rama a tu rama actual
      • + git merge <NOMBREDELABRANCH> +
    • Cambia la rama en la que estás trabajando
      • + git checkout <NOMBREDELABRANCH> +
    • Borra una rama local
      • + git branch -d <NOMBREDELABRANCH> +
    • Borra una rama remota
      • + git push <NOMBREDELREMOTO> --delete <NOMBREDELABRANCH> +
    • Tira (pull) desde una rama remota
      • + git pull <NOMBREDELREMOTO> <NOMBREDELABRANCH> +
    +
    diff --git a/resources/contents/es-ES/challenges/1_get_git.html b/resources/contents/es-ES/challenges/1_get_git.html new file mode 100644 index 0000000000..e8eeeec869 --- /dev/null +++ b/resources/contents/es-ES/challenges/1_get_git.html @@ -0,0 +1,70 @@ +
    +

    Instala Git en tu ordenador y configura tu nombre y correo electrónico.

    +
    + +
    +

    Git

    +

    Git es un software libre y de código abierto (el código fuente es + público) escrito por Linus Torvalds, quien también escribió el kernel del sistema operativo Linux.

    +

    Git es un programa para hacer seguimiento a los cambios a través del tiempo, conocido en programación como control de versiones. + Si has usado algún tipo de seguimiento de cambios en software de edición de texto, ¡entonces ya conoces el concepto! +

    +
    + +
    +

    Instalar Git

    +

    Recomendamos instalar Git en tu ordenador descargando la aplicación GitHub + Desktop. No usaremos la aplicación de escritorio en Git-it (vamos a aprender a hacerlo con la consola/terminal), pero la versión de escritorio incluye Git y + es la manera más fácil de instalarlo en todas las plataformas de la misma manera.

    + +
      +
    • Para Windows: usa Git CMD como tu terminal.
      • +
    • Para Mac: Abre GitHub Desktop y desde Preferencias, selecciona la instalación de línea de comandos. Usa + la terminal de Mac. +
      • +
    + +

    ¿Ya tienes Git instalado, o no lo sabes? Escribe git --version en tu terminal y si devuelve un número de versión + mayor a la versión 1.7.10, ¡todo listo! Para más información, visita el sitio web de Git. +

    +
    + +
    +

    Software de Git

    +

    La aplicación de escritorio de GitHub (GitHub Desktop) puede hacer muchas cosas con Git, pero no todas; por eso aprender a usar la terminal + es importante. Una vez lo hayas conseguido, te vendrá bien tener la versión de escritorio de la aplicación porque organiza la + información de tu proyecto de una forma más visual, parecido al sitio web de GitHub.

    + +

    Git en sí mismo no es como los otros programas en tu ordenador. No verás un icono en tu escritorio o menú, pero + siempre estará disponible para que lo puedas utilizar en cualquier momento desde tu terminal o a través de las aplicaciones + de escritorio que lo requieran.

    +
    + +
    +

    Configurar Git

    +

    Una vez GitHub Desktop (y Git) estén instalados, abre tu terminal. + Puedes verificar si está disponible escribiendo:

    + +

    git --version

    + +

    Esto devolverá la versión de Git que tienes instalada en tu ordenador y se parecerá a lo siguiente:

    + +

    git version 1.9.1

    + +

    Lo siguiente es configurar Git de manera que pueda asociarte los cambios que hagas:

    +

    Establece tu nombre:

    +

    git config --global user.name "Tu nombre"

    +

    Establece tu email:

    +

    git config --global user.email "tuemail@ejemplo.com"

    + +

    ¡Has terminado tu primer reto! Haz clic en el botón 'Verificar' para mostrarte el resultado.

    +
    + +{{{ verify_button }}} + +
    +

    Los símbolos de dólar el código de la documentación

    +

    Los símbolos de dólar $ son usados frecuentemente en ejemplos de comandos para identificar la línea mostrada como una línea + comando (mira las líneas de ejemplo presentadas más arriba). No necesitas escribir el signo $, sólo + escribe lo que viene después.

    +
    diff --git a/resources/contents/es-ES/challenges/2_repository.html b/resources/contents/es-ES/challenges/2_repository.html new file mode 100644 index 0000000000..df67418a5e --- /dev/null +++ b/resources/contents/es-ES/challenges/2_repository.html @@ -0,0 +1,74 @@ +
    +

    Crea un nuevo repositorio en tu ordenador.

    +
    + +
    +

    Repositorios

    +

    Un repositorio es una colección de elementos relacionados. En nuestro caso, cuando estamos escribiendo software, es una + colección de archivos relacionados a un proyecto de software. Puedes imaginarlo como la carpeta de un proyecto con todos los archivos + relevantes en us interior. De hecho, así es como se verá en tu ordenador de todas maneras. Algunas veces se les llama también + "repos" como abreviación.

    + + Un dibujo con cuatro carpetas + +

    Le dices a Git qué carpeta contiene tu proyecto y Git empezará a hacer el seguimiento de todos los cambios en esa carpeta. Esto es lo que conforma un + repositorio de Git: una carpeta de elementos que son seguidos por Git. Git hace seguimiento de cuándo se añaden archivos, cuándo se extraen e incluso cuándo una + simple letra en un simple archivo ha sido cambiada. A todo esto Git le añade quién y cuándo lo hizo. En software, + al proceso de hacer seguimiento a los cambios se le llama control de versiones.

    + +

    Usando la terminal (o consola)

    +

    La terminal (o bash, o consola, o línea de comandos) es la manera de decirle a tu ordenador que haga cosas escribiendo comandos en vez de + haciendo clic en las aplicaciones con el ratón. Puedes renombrar archivos, abrir archivos, crear nuevas carpetas, moverte entre + directorios (carpetas) y mucho más sólo con escribir comandos. ¡Puedes incluso usar un editor de texto para código (como Vim) en tu terminal y + y nunca dejar de usarla!

    + +

    Además de navegar por los archivos de tu ordenador, puedes usar programas en la terminal que tienen interfaz de línea de comandos (command-line + interface o CLI). Esto significa que pueden funcionar con comandos desde la terminal. Git es uno de estos. La primera parte + del comando comunica a tu ordenador que le estás hablando a Git. Las siguientes partes son comandos y + diferentes opciones que quieres Git haga.

    + +

    En Git-it aprenderás algunas acciones de línea de comandos básicas (además de los comandos de Git) para navegar por tu + ordenador; éstas se irán describiendo en los pasos según correspondan.

    +
    + +
    +

    Crear un repositorio

    +

    Vas a crear un nuevo proyecto en una carpeta y entonces iniciarás un repositorio de Git. Llamaremos la carpeta 'hola-mundo' + en este reto, pero puedes elegir el nombre que quieras si ya tienes una carpeta con este nombre (es un nombre común para crear proyectos de prueba).

    + +

    ¡Es hora de abrir tu terminal! +

    + +

    En la ventana de tu terminal, escribe estos comandos, uno cada vez, y presionando Enter después de cada uno.

    + +

    Primero, crea una nueva carpeta:
    Ten en cuenta: mkdir hace referencia a make directory (crear directorio en inglés)

    + mkdir hola-mundo + +

    Ahora vamos a situarnos dentro de la carpeta:
    Ten en cuenta: cd hace referencia a change directory (cambiar directorio en inglés)

    + cd hola-mundo + +

    Finalmente, dile a Git que inicie (empiece el seguimiento) de la carpeta en la que estás actualmente:

    + git init + +

    El último comando debe devolver algo como "Initialized empty Git repository". Los otros comandos + no tienen retorno, es decir, no devuelven ningún mensaje.

    + +

    ¡Lo lograste! Si quieres asegurarte de que es un repositorio de Git, escribe git status y si + no devuelve 'fatal: Not a git repository...', ¡está hecho!

    +
    + +{{{ verify_directory_button }}} + +
    +
      +
    • Crear una nueva carpera (make directory)
      • + mkdir <NOMBREDELACARPETA> +
    • Navegar o moverse hacia una carpeta existente (change directory)
      • + cd <NOMBREDELACARPETA> +
    • Listar los contenidos de una carpeta
      • + ls +
    • Iniciar Git en una carpeta
      • + git init +
    +
    diff --git a/resources/contents/es-ES/challenges/3_commit_to_it.html b/resources/contents/es-ES/challenges/3_commit_to_it.html new file mode 100644 index 0000000000..7292bae78d --- /dev/null +++ b/resources/contents/es-ES/challenges/3_commit_to_it.html @@ -0,0 +1,68 @@ +
    +

    Crea un archivo en tu nuevo repositorio, añade algo al archivo y guarda (commit) el cambio en Git.

    +
    + +
    +

    Commits (guardar)

    +

    Los commits son el centro de Git. Es en ese momento, cuando haces un commit, cuando guardas y describes el trabajo que has hecho. Son + los puntos en la línea del tiempo del historial de tu proyecto.

    +
    + +
    +

    Crea un nuevo archivo

    +

    Ahora que tienes un repositorio iniciado, agreguémosle un archivo.

    +

    Abre tu editor de texto y crea un nuevo archivo vacío. Ahora escribe algo de texto, por ejemplo "Hola!", y + guarda el archivo como 'readme.txt' en la carpeta 'hola-mundo' que creaste en el anterior reto.

    +
    + +
    +

    Verificar el estado + hacer commit de los cambios

    +

    Ahore revisemos el estado (status) de tu repositorio para verificar si ha habido cambios. Tú sabes que + has cambiado algo, pero ¿lo sabe Git?

    + +

    Asegúrate de que aún estás en el directorio 'hola-mundo' cuando ejecutes estos comandos. Usa Git para ver + qué cambió en tu repositorio:

    + +

    Primero, verifica el estado:

    +

    git status

    +

    Git debería decirte que un archivo ha sido añadido.

    + +

    Entonces añade (add) el archivo que acabaste de crear, de forma que sea parte de los cambios que vas a guardar (commit) + con Git:

    +

    git add readme.txt

    + +

    Finalmente, haz commit (guarda) estos cambios en el historial del repositorio con un + mensaje (m) corto que describe la actualización realizada.

    +

    git commit -m "readme creado"

    +
    + +
    +

    Siguiente paso: Crea más cambios

    +

    Ahora añade otra línea a 'readme.txt' y guarda el archivo otra vez.

    + +

    En la terminal, puedes ver las diferencias diff que hay entre el archivo ahora mismo y el archivo en el momento que creaste + el último commit.

    + +

    Dile a Git que te muestre las diferencias diff:

    +

    git diff

    + +

    Ahora con lo que aprendiste previamente, crea un commit (guarda) con el cambio más reciente.

    +
    + +{{{ verify_directory_button }}} + +
    +
      +
    • Para verificar el estado de los cambios en un repositorio
      • +
    • git status
      • +
    • Ver diferencias entre las versiones (commits) de los archivos
      • +
    • git diff
      • +
    • Añadir un archivo para ser guardado (commit)
      • +
    • git add <NOMBREDELARCHIVO>
      • +
    • Para añadir todos los archivos con cambios
      • +
    • git add .
      • +
    • Para crear un commit (guardar) los cambios que añadiste con un mensaje corto que los describe +
      • +
    • git commit -m "tu descripción del commit"
      • +
        +
    diff --git a/resources/contents/es-ES/challenges/4_githubbin.html b/resources/contents/es-ES/challenges/4_githubbin.html new file mode 100644 index 0000000000..afe38a2e11 --- /dev/null +++ b/resources/contents/es-ES/challenges/4_githubbin.html @@ -0,0 +1,53 @@ +
    +

    Crea una cuenta de GitHub y agrega tu nombre de usuario a la configuración de Git.

    +
    + +
    +

    Trabaja mejor, Juntos

    + +

    El repositorio que has creado solamente existe en tu computadora, que es útil, pero hace que sea bastante difícil compartir + y trabajar con otras personas. No te preocupes, ¡para eso está GitHub!

    + +

    GitHub es un sitio web que permite a personas de cualquier lugar subir el código que tienen en Git para que cualquier otra persona pueda + fácilmente trabajar en conjunto en el mismo proyecto. GitHub actúa cómo el repositorio central para que tú y otras personas + compartan. Tú empujas (push) tus cambios a Github y puedes obtener (pull) los cambios que han hecho otras personas.

    +
    + +
    +

    Crea una cuenta de GitHub

    + +

    Visita github.com y registra una cuenta gratuita. ¡Choca esos + cinco, aquí estás!

    +
    + +
    +

    Agrega tu nombre de usuario de GitHub a Git

    +

    Agrega tu nombre de usuario de GitHub a tu configuración local de Git. Haremos esto solo por el bien de Git-it (este tutorial), ya que hace más fácil + verificar los próximos retos. Guarda exactamente el nombre de usuario que creaste en GitHub y pon las mayúsculas + donde las haya. Nota: no necesitas ingresar los símbolos "<" y ">".

    + +

    Añade tu nombre de usuario de GitHub a tu configuración de Git:

    + git config --global user.username <USerNamE> + +

    Puedes verificar lo que acabas de ingresar en tu configuración de Git escribiendo:

    + git config --global user.username +
    + +{{{ verify_button }}} + +
    +

    Asegúrate de escribir "user.username" arriba y no "user.name", que puede sobreescribir lo que hiciste + en el primer reto, ¡y dejarte sin configurar correctamente tu nombre de usuario (username)! Si te das cuenta de que lo has hecho mal, no pasa nada, sólo + repite el paso del primer reto para agregar tu nombre y completar el paso anterior.

    +
    + +
    +

    Si los nombres de usuario de GitHub y Git no coindiden en la configuración

    + +

    Un error común es que el usuario de GitHub no coincida con las mayúsculas del que configuraste en git config. + Por ejemplo, 'JLord' no es lo mismo que 'jlord'

    +

    Para cambiar el nombre de usuario en Git, simplemente ejecuta el comando que usaste antes, pero con las letras + mayúsculas en el lugar correcto:

    +

    git config --global user.username <USerNamE>

    +

    Cuando hayas hecho las correcciones, ¡vuelve a verificar!

    +
    diff --git a/resources/contents/es-ES/challenges/5_remote_control.html b/resources/contents/es-ES/challenges/5_remote_control.html new file mode 100644 index 0000000000..7c0ccea4dd --- /dev/null +++ b/resources/contents/es-ES/challenges/5_remote_control.html @@ -0,0 +1,112 @@ +
    +

    Conecta tu repositorio local a uno remoto y empuja (push) los cambios a este último.

    +
    + +
    +

    Remotos (remotes)

    + +

    Cuando pones algo en GitHub, esa copia vive en uno de los servidores de GitHub. Esto lo convierte en un + repositorio remoto (remote) porque no está en tu ordenador, está en un servidor "remoto" en algún otro + lugar. Empujando (pushing) tus cambios locales (los de tu ordenador) a éste, lo mantienes + al día.

    + +

    Otras personas siempre pueden obtener lo más reciente de tu proyecto tirando (pulling) de tus cambios desde el + remoto (a otro ordenador). Así es cómo varias personas pueden trabajar juntas en un proyecto sin necesidad de tener acceso a + tu ordenador, donde está almacenada tu copia local.

    + + Un diagrama que muestra GitHub como servidor central que crea el sitio web GitHub.com. Dos ordenadores, uno a cada lado, están empujando (push) y tirando (pull) de GitHub. +
    + +
    +

    Crear un repositorio remoto

    +

    Si quieres sincronizar tu versión local con la que está guardada en GitHub.com, primero crea un nuevo repositorio remoto (remote) + en GitHub.com.

    + +
      +
    • Ve a github.com, haz login, y haz clic en el '+' situado arriba a la derecha + y después en 'Nuevo repositorio' ('New repository'). +
      • +
    • Dale un nombre que coincida con el nombre de tu repositorio local, 'hola-mundo', y una descripción corta.
      • +
    • Hazlo público. Esto significa que será listado en tu perfil público.
      • +
    • No inicialices con un archivo README porque ya tienes un archivo, localmente, llamado 'readme.txt'. Esta opción es una ayuda + de GitHub si todavía no has creado uno local en tu ordenador. +
      • +
    • Las opciones '.gitignore' and 'license' deben quedar en 'none' (ninguna). No las usaremos en este tutorial.
      • +
    • Haz clic en 'Create Repository' (crear repositorio).
      • +
    +
    + +
    +

    Readmes, .gitignores y Licenses

    +

    Estos son archivos comunes en proyectos de código abierto, así que para iniciar un proyecto más fácilmente, GitHub ofrece una + opción para crearlos por ti.

    +

    Un README describe lo que es el proyecto, cómo usarlo y, generalmente, cómo contribuir al mismo (algunas + veces hay un archivo extra, 'CONTRIBUTING.md', para estos últimos detalles).

    +

    Un .gitignore es una lista de archivos a los que Git NO debería hacer seguimiento, por ejemplo, ¡archivos con + contraseñas!

    +

    Un archivo license describe el tipo de licencia que pusiste en tu proyecto. Esto permite a otros saber cómo + pueden usarlo. Puedes encontrar más información de los tipos de licencia en: choosealicense.com. +

    +
    + +
    +

    Conecta tu Local a tu Remoto

    +

    Ahora que has iniciado un repositorio remoto en GitHub.com, en la parte de arriba puedes ver una 'configuración rápida' ('Quick Setup'). Asegúrate de que + el botón 'HTTPS' está seleccionado y copia la dirección, que es la dirección de tu repositorio en los servidores de GitHub.

    + +

    Vuelve a la terminal, y situado dentro de la carpeta 'hola-mundo' que inicializaste como repositorio de Git en el reto anterior, vas a decirle a Git que recuerde la dirección de la versión remota en los servidores GitHub. Puedes + tener varios remotos configurados en tu ordenador local, por lo que el remoto necesita un nombre. El remoto principal es generalmente llamado origin. +

    + +

    Para agregar un remoto llamado 'origin' a tu repositorio:

    + git remote add origin <URLDEGITHUB> + +

    Tu repositorio local ahora sabe dónde está tu repositorio remoto, llamado 'origin', + que está ubicado en los servidores de GitHub. Piensa en esto como si añadieras un nombre y un número de teléfono en los contactos de tu teléfono móvil para llamarlos rápidamente + cada vez que te haga falta.

    + +
    +

    Usuarios de Windows:

    +

    Si tienes GitHub Desktop en tu ordenador, un remoto llamado 'origin' se crea automáticamente en tu repositorio local. En este caso, sólo necesitarás decirle qué URL asociar con + 'origin'. Para esto, en vez de usar el comando 'add' mencionado anteriormente, utiliza el siguiente:

    + + git remote set-url origin <URLDEGITHUB> +
    +
    + +
    +

    Empuja (push) tu trabajo al remoto

    +

    Lo siguiente es hacer push (empujar) todo lo que has hecho localmente a tu repositorio remoto en GitHub. + Esto es algo que harás con frecuencia para que tu versión remota esté al día y coincida con el estado tu versión + local.

    + +

    Git tiene un sistema de ramas (branches) para que puedas trabajar en diferentes partes del proyecto en tiempos diferentes. Aprenderemos + más acerca de ello después, pero por defecto la primera branch es nombrada 'master'. Cuando empujas (push) (y más adelante tiras) desde un + proyecto, le dices a Git el nombre de la rama (branch name) que quieres y el nombre del remoto + en el que debe residir.

    + +

    En este caso, vamos a enviar una rama llamada 'master' a nuestro remoto en GitHub llamado 'origin'.

    + git push origin master + +

    Ahora ve a la página de tu repositorio remoto en GitHub.com y actualízala. ¡Wow! Todo + es lo mismo ahora en tu ordenador local y remotamente en GitHub. Felicidades, ¡has creado tu primer repositorio público!

    +
    + +{{{ verify_directory_button }}} + +
    +
      +
    • Agregar conexiones remotas
      • + git remote add <NOMBREDELREMOTO> <URL> +
    • Modificar la URL de un remoto
      • + git remote set-url <NOMBREDELREMOTO> <URL> +
    • Tirar de los cambios
      • + git pull <NOMBREDELREMOTO> <NOMBREDELBRANCH> +
    • Ver las direcciones remotas
      • + git remote -v +
    • Empujar cambios
      • + git push <NOMBREDELREMOTO> <BRANCH> +
    +
    diff --git a/resources/contents/es-ES/challenges/6_forks_and_clones.html b/resources/contents/es-ES/challenges/6_forks_and_clones.html new file mode 100644 index 0000000000..82d2e1ff9d --- /dev/null +++ b/resources/contents/es-ES/challenges/6_forks_and_clones.html @@ -0,0 +1,85 @@ +
    +

    Bifurca (fork) un proyecto desde GitHub.com y clónalo localmente.

    +
    + +
    +

    Bifurcaciones (forks)

    +

    Hasta ahora has creado un proyecto local y lo has subido a GitHub, ¡pero esto es sólo la mitad de la diversión! La otra mitad + está con otras personas y otros proyectos.

    + +

    Cuando bifurcas (fork) un repositorio, estás creando una copia del mismo en tu cuenta de GitHub. Tu copia + bifurcada empieza su vida como un repositorio remoto que sólo existe en tu cuente de GitHub, no en tu + ordenador. Las bifurcaciones (forks) son usadas para crear tu propia versión de un proyecto (esta división es como + tomar una bifurcación cuando vas por una carretera) o contribuir con tus cambios (como solucionar errores o añadir nuevas funcionalidades) al proyecto + original.

    + +

    Para conseguir una copia de tu bifurcación en GitHub a tu ordenador, tienes que clonar (clone) el proyecto. La + acción de clonar copia el repositorio remoto en tu ordenador para que puedas trabajar localmente.

    + + Un diagrama que muestra un repositorio de GitHub copiado a tu cuenta de GitHub y, desde ahí, a tu ordenador local. +
    + +
    +

    Bifurca (fork) el repositorio Patchwork

    +

    El proyecto con el que vamos a trabajar está en github.com/jlord/patchwork. + Ve a esa paǵina y haz clic en el botón 'Fork' arriba a la derecha. Una vez finalizada la animación de bifurcación en la página, tienes + una copia en tu cuenta. Copia la dirección HTTP de tu fork desde la barra de direcciones del navegador, esta es la dirección de + tu fork en los servidores de GitHub.

    + +
    + +
    +

    Clona tu fork localmente

    +

    Volvemos a la terminal para clonar el repositorio en tu ordenador. Automáticamente, esto creará una nueva carpeta para + el repositorio, así que no tienes necesidad de crear una manualmente. ¡Asegúrate de que no estás clonándolo dentro de otra + carpeta con otro repositorio de Git!

    + +

    Comprueba, por lo tanto, que no estás dentro del directorio de 'hola-mundo' de los anteriores retos. Para abandonar esa carpeta + para que puedas clonar el nuevo repositorio, sigue los pasos a continuación:

    + +

    Para salir de la carpeta 'hola-mundo':
    Consejo: los dos puntos significan un nivel superior del directorio actual +

    +

    cd ..

    + +

    Ahora que ya no estás en un repositorio de Git, clona tu fork:

    +

    git clone <URLDEGITHUB>

    + +

    Ve a la carpeta creada para el fork (en este caso se debería llamar 'patchwork').

    +

    cd patchwork

    + +

    Ahora que tienes una copia del repositorio en tu ordenador y está automaticamente conectada a el repositorio + remoto (tu copia bifurcada) en tu cuenta de GitHub, escribe git remote -v para ver las direcciones + que el fork ya tiene configuradas.

    +
    + +
    +

    Conectar con el repositorio original

    + +

    ¿Qué pasa si el repositorio original tiene cambios nuevos? Vas a querer tenerlos y tirar (pull) + de esos cambios. Para eso agregaremos otra conexión remota, esta vez la original, github.com/jlord/patchwork, con su URL.

    + +

    Puedes ponerle el nombre que quieras a esta conexión remota, pero normalmente la gente usa 'upstream' como nombre; usemos + ese nombre para esto.

    + +

    git remote add upstream https://github.com/jlord/patchwork.git

    + +

    Para asegurarnos de que tienes correctamente configuradas las conexiones remotas, escribe git remote -v para listar las direcciones + que tienes guardadas. Derías tener un remoto con nombre 'origin' con la dirección remota de tu fork y otro con el nombre 'upstream' con + la dirección del remoto original, es decir, la URL que está encima de este párrafo.

    +
    + +{{{ verify_directory_button }}} + +
    +
      +
    • Agregar un remoto
      • +
    • git remote add <NOMBREDELREMOTO> <URL>
      • +
    • Cambiar la URL a un remoto
      • +
    • git remote set-url <NOMBREDELREMOTO> <URL>
      • +
    • Ver las conexiones remotas
      • +
    • git remote -v
      • +
    +
    diff --git a/resources/contents/es-ES/challenges/7_branches_arent_just_for_birds.html b/resources/contents/es-ES/challenges/7_branches_arent_just_for_birds.html new file mode 100644 index 0000000000..652966a301 --- /dev/null +++ b/resources/contents/es-ES/challenges/7_branches_arent_just_for_birds.html @@ -0,0 +1,123 @@ +
    +

    Añade una branch, localmente, a tu repositorio bifurcado para realizar tus cambios.

    +
    + +
    +

    Branches (ramas)

    +

    Los repositorios de Git usan ramas para separar el trabajo cuando es necesario. Es una práctica común cuando se trabaja en un proyecto con + otras personas, crear una branch sobre la que realizar tus cambios. De esta manera puedes hacer + tu trabajo mientras que la rama principal, comúnmente llamada 'master', se mantiene estable. Cuando terminas el trabajo en tu rama, + fusionas tu rama con la rama 'master'.

    + +

    El siguiente diagrama muestra cómo puedes crear una rama a partir de 'master', hacer el trabajo y luego fusionar esos cambios de vuelta + a 'master'. Incluso puedes crear una rama desde tu rama, la rama 'master' no necesariamente tiene que ser + la base.

    + + Un diagrama que muestra una línea horizontal, representando la branch master, con otra línea separándose de la parte superior y después volviéndose a unir con la original. Otra línea se separa de la branch master desde abajo y una más de esta última. Estas dos branches vuelven a encontrarse también con la línea principal master. + +

    Para entender mejor cómo funcionan las ramas en un proyecto, revisa la guía de GitHub: guides.github.com/overviews/flow (en inglés)

    + +

    Páginas de GitHub

    +

    GitHub automáticamente servirá y alojará un sitio web de archivos estáticos en las ramas o branches nombradas 'gh-pages'. Este servicio gratuito + se llama GitHub Pages. Como el proyecto bifurcado crea un sitio web, su + rama principal se llama 'gh-pages' en vez de 'master'. Todos los repositorios que tienen una rama 'gh-pages' con sitio web + se encuentran disponibles online, usando el siguiente patrón en la URL:

    + + http://usuariogithub.github.io/nombredelrepositorio +
    + +
    +

    Crea una rama

    +

    Cuando creas una rama, Git copia todo lo que hay en la rama en la que estás actualmente y lo pone en la rama + que acabas de crear.

    + +

    Estando dentro de tu repositorio local 'patchwork', escribe git status para ver en qué rama + estás actualmente. Git podría decirte que estás en la rama 'gh-pages'.

    + +

    Ahora crea una nueva rama y nombrala "add-<username>", donde 'username' es tu nombre de usuario de GitHub. Por ejemplo, + "add-jlord". Las ramas son sensibles a mayúsculas así que nombra tu rama exactamente de la misma forma que aparece tu cuenta de usuario de GitHub.

    + +

    git branch <NOMBREDELABRANCH>

    + +

    Ahora tienes una rama con un nombre, que es idéntica a la rama 'gh-pages'.

    + +

    Para pasarte a esa rama debes hacer checkout de ella, cambiarte. Ve a la nueva rama:

    + +

    git checkout <NOMBREDELABRANCH>

    +
    + +
    +

    Paso: Crear un nuevo archivo

    +

    Vuelve a tu editor de texto:

    +
      +
    • Crea un archivo llamado "add-<USERNAME>.txt", donde + 'username' es tu nombre de usuario. Por ejemplo, "add-jlord.txt". +
      • +
    • Ahora sólo escribe tu nombre de usuario GitHub, eso es todo. Por ejemplo, yo escribiría 'jlord'.
      • +
    • Guarda este archivo en la carpeta 'contributors' dentro de Patchwork: Patchwork/contributors/add-yourusername.txt +
      • +
    • Siguiente paso, verifica los cambios (mira abajo).
      • +
    +
    + +
    +

    Check-in

    +

    Haz los siguientes pasos para guardar tus cambios:

    + +

    git status

    +

    git add <contributors/NOMBREDELARCHIVO>

    +

    git commit -m "mensaje de commit"

    + +

    Ahora haz push de tus cambios al fork, 'origin', en GitHub:

    +

    git push origin <NOMBREDELABRANCH>

    +
    + +{{{ verify_directory_button }}} + +
    +

    Permission denied...error: 403

    +

    Estás empujando cambios a un repositorio en el cual no tienes permisos de escritura. En este caso, seguramente estás queriendo enviarlos al original 'jlord/patchwork'. Asegúrate de que estás apuntando a 'origin' y que origin apunta a tu fork en tu cuenta personal de GitHub. Para comprobar cuáles son tus remotos y a donde apuntan, ejecuta git remote -v. + Deberías tener 'upstream' apuntando a 'jlord/patchwork' y 'origin' apuntando a 'tunombredeusuario/patchwork'. + +

    Para arreglar un remoto que apunta a la dirección equivocada, puedes cambiar su URL: git remote set-url origin + . + +

    Authentication failed...error: 401

    +

    Tu identidad no pudo ser verificada. Pueden que tengas la autenticación en dos pasos activada; en este caso tienes que usar un token de acceso personal como contraseña. + Puedes generar uno siguiendo las instrucciones. + Necesitarás mantenerlo y usarlo en lugar de tu contraseña cuando sea requerido. También puedes + guardar este token de acceso en tu ordenador para volverlo a utilizar.

    + +

    El archivo no está en la carpeta contributors

    +

    El archivo creado debería estar en el interior de la carpeta 'contributors' en el repositorio Patchwork. Si + lo pusiste en otro lugar, simplemente usa el explorador de archivos para mover el archivo a la carpeta. Puedes + verificar con git status otra vez y verás tus cambios. Añade y haz commit "all" (-A) de + estos cambios (adiciones y borrados) con los siguientes comandos.

    +

    git add -A

    +

    git commit -m "mover archivo a la carpeta contributors"

    + +

    Nombre de la rama esperado: _____

    +

    El nombre de la rama debería coincidir con tu nombre de usuario exactamente. Para cambiar el nombre de la rama:

    +

    git branch -m <NUEVONOMBREDELABRANCH>

    +

    Una vez hagas estos cambios, ¡verifica nuevamente!

    +
    + +
    +
      +
    • Crear y moverse a la rama en una sola línea
      • +
    • git checkout -b <NOMBERDELABRANCH>
      • +
    • Crear una rama nueva
      • +
    • git branch <NOMBERDELABRANCH>
      • +
    • Moverse a una rama
      • +
    • git checkout <NOMBERDELABRANCH>
      • +
    • Listado de las ramas
      • +
    • git branch
      • +
    • Renombrar la rama en la que estás
      • +
    • git branch -m <NOMBERDELABRANCH>
      • +
    • Verificar la rama en la que estás y su estado
      • +
    • git status
      • +
    +
    diff --git a/resources/contents/es-ES/challenges/8_its_a_small_world.html b/resources/contents/es-ES/challenges/8_its_a_small_world.html new file mode 100644 index 0000000000..5cdbba630e --- /dev/null +++ b/resources/contents/es-ES/challenges/8_its_a_small_world.html @@ -0,0 +1,31 @@ +
    +

    Añadir un colaborador a tu proyecto.

    +
    + +
    +

    Escritura social de código

    +

    Trabajar con otros es una de las mejores cosas de GitHub porque es más fácil trabajar desde cualquier lugar o + zona horaria con otras personas.

    + +

    Los colaboradores son otros usuarios de GitHub que tienen permisos para hacer cambios a un repositorio + que pertenece a otra persona. Puede que oigas también el término contribuyente (contributor); esto describe a un usuario de GitHub + que ha hecho contribuciones, por medio de forks y pull requests, a un proyecto.

    + + Una foto de un gato con un casco espacial dibujado. Este es el gato Reporobot y colaborador tuyo. + @reporobot es un robot del espacio exterior que ama colaborar en repos. +
    + +
    +

    ¡Hola, Repo Robot!

    +

    Para añadir colaboradores a uno de nuestros proyectos, visita la página de tu repositorio en tu cuenta de GitHub y haz clic en + la pestaña 'Settings' (configuración) en el menú en la parte superior de la página. Selecciona la opción 'Collaborators' (colaboradores). Escribe el + nombre de usuario dentro del campo de texto y haz clic en 'Add'.

    + +

    Ve a la página de tu repositorio bifurcado en GitHub y añade 'reporobot' como colaborador. La URL debería ser + como la siguiente, pero con tu nombre de usuario.

    + + github.com/TUNOMBREDEUSUARIO/patchwork/settings/collaboration +
    + +{{{ verify_button }}} diff --git a/resources/contents/es-ES/challenges/9_pull_never_out_of_date.html b/resources/contents/es-ES/challenges/9_pull_never_out_of_date.html new file mode 100644 index 0000000000..5c2c3afc69 --- /dev/null +++ b/resources/contents/es-ES/challenges/9_pull_never_out_of_date.html @@ -0,0 +1,39 @@ +
    +

    Mantén tus archivos actualizados tirando (pulling) de los cambios de los colaboradores.

    +
    + +
    +

    Tirando (pulling) de un remoto

    +

    Si estás trabajando en algo con alguien más, necesitas estar al día con los últimos cambios. Así que vas a querer + tirar (pull) de los cambios que pueden haber sido añadidos al repositorio central en GitHub.

    + + Un diagrama muestra un ordenador obteniendo cambios desde el sitio web de un repositorio. +
    + +
    +

    ¿Qué ha estado haciendo Reporobot?

    +

    Revisa si Reporobot ha hecho algún cambio en tu branch tirando de cualquier cambio hecho en el remoto con el nombre 'origin' en + GitHub:

    + +

    git pull <NOMBREDELREMOTO> <NOMBREDELABRANCH>

    + +

    Si nada ha cambiado, Git te mostrará un mensaje similar a 'Already up-to-date'. Si hay cambios, Git fusionará esos cambios + en tu versión local.

    + +

    ¿Hizo Reporobot algún cambio? Git te dice dónde se han encontrado cambios. Puedes abrir ese archivo con los cambios que Reporobot + hizo. ¡Sorpresa, Reporobot es un artista!

    +
    + +{{{ verify_directory_button }}} + +
    +
      +
    • Estado de Git
      • + git status +
    • Tirar (pull) de los cambios desde una branch remota
      • + git pull <NOMBREDELREMOTO> <NOMBREDELABRANCHREMOTA> +
    • Ver los cambios de una rama remota antes de tirar de ellos
      • + git fetch --dry-run +
    +
    diff --git a/resources/contents/es-ES/pages/about.html b/resources/contents/es-ES/pages/about.html new file mode 100644 index 0000000000..a57e402af5 --- /dev/null +++ b/resources/contents/es-ES/pages/about.html @@ -0,0 +1,17 @@ +

    Acerca de Git-it

    +

    Git-it enseña lo esencial, los comandos de Git que los desarralladores usan todos los días junto con el GitHub Flow, + que es la manera en que los desarrolladores colaboran en GitHub.

    + +

    Algunos de los retos requieren conexión a internet, por lo que necesitarás estar en línea para completar Git-it. Pero siempre podrás + abrir la aplicación y ver los retos y recursos cuando no estés en línea.

    + +

    Ambiente de desarrollo real

    + +

    Git-it usa la consola, Git y GitHub realmente (en vez de hacer una simulación). Cuando termines, ¡tendrás + repositorios en tu cuenta de GitHub y cuadros verdes en tu gráfico de contribuciones!

    + +

    El código en el que está hecho Git-it

    + +

    Esta aplicación está construída con HTML, CSS y JS, y usa la librería Electron. Todo el + código de Git-it está en línea en su repositorio en + GitHub. Git-it está hecho con amor por @jlord y contribuidores muy amables.

    diff --git a/resources/contents/es-ES/pages/dictionary.html b/resources/contents/es-ES/pages/dictionary.html new file mode 100644 index 0000000000..2e99e43d16 --- /dev/null +++ b/resources/contents/es-ES/pages/dictionary.html @@ -0,0 +1,108 @@ +

    A continuación están los comandos de consola (terminal, shell) y Git usados en los retos de Git-it.

    + +

    Comandos básico Bash/Terminal

    +
    +
      +
    • Crear nueva carpeta (crear nuevo directorio)
      • + mkdir <NOMBREDELDIRECTORIO> +
    • Navegar hacia una carpeta (directorio) existente
      • + cd <NOMBREDELDIRECTORIO> +
    • Listar los elementos que hay dentro de una carpeta
      • + ls +
    +
    + +

    Configuración de Git

    +
    +
      +
    • Verificar la versión de Git
      • + git --version +
    • Establecer tu nombre
      • + git config --global user.name "Your Name" +
    • Establecer tu email
      • + git config --global user.email youremail@example.com +
    • Establecer tu cuenta de Github (sensitivo a mayúsculas y minúsculas)
      • + git config --global user.username uSeRnAmE +
    +
    + +

    Comandos básicos de Git

    +
    +
      +
    • Iniciar Git dentro de una carpeta
      • + git init +
    • Verificar el estado de los cambios
      • + git status +
    • Ver los cambios dentro de los archivos
      • + git diff +
    • Agregar los cambios de un archivo para crear un commit
      • + git add <NOMBREDEARCHIVO> +
    • Agregar todos los cambios en todos los archivos
      • + git add . +
    • Crear un commit (guardar) los cambios que agregaste con un corto mensaje descriptivo de los cambios +
      • + git commit -m "mensaje descriptivo" +
    • Copiar un repositorio a tu computadora
      • + git clone <URL> +
    +
    + +

    Ramas (branches) de Git

    +
    +
      +
    • Crear una nueva rama (branch)
      • + git branch <NOMBREDELARAMA> +
    • Moverse a una rama
      • + git checkout <NOMBREDELARAMA> +
    • Crear una rama nueva y moverse inmediatamente a la misma
      • + git checkout -b <NOMBREDELARAMA> +
    • Listado de las ramas
      • + git branch +
    • Renombrar la rama en la cual estás ubicado
      • + git branch -m <NUEVONOMBREDELARAMA> +
    +
    + +

    Conexiones a repositorios remotos en Git (Git Remotes)

    +
    +
      +
    • Agregar una conexión remota
      • + git remote add <NOMBREDELREMOTO> <URLDELREMOTO> +
    • Agregar o cambiar la url de un remoto
      • + git remote set-url <NOMBREDELREMOTO> <NUEVAURLDELREMOTO> +
    • Ver las conexiones remotas
      • + git remote -v +
    +
    + +

    Halar (pull) los cambios en Git

    +
    +
      +
    • Halar (pull in) cambios
      • + git pull +
    • Halar (pull in) los cambios desde una rama remota
      • + git pull <NOMBREDELREMOTO> <NOMBRERAMAREMOTA> +
    • Ver cambios remotos antes de halar
      • + git fetch --dry-run +
    +
    + +

    Empujar (push) & en Git

    +
    +
      +
    • Empujar (push) cambios
      • + git push <NOMBREDELREMOTO> <NOMBREDELARAMA> +
    • Fucionar (merge) una rama a la rama actual
      • + git merge <NOMBREDELARAMA> +
    +
    + +

    Borrar conexiones remotas y ramas en Git

    +
    +
      +
    • Borrar una rama local
      • + git branch -D <NOMBREDELARAMA> +
    • Borrar una rama remota
      • + git push <NOMBREREMOTO> --delete <NOMBREDELARAMA> +
    +
    diff --git a/resources/contents/es-ES/pages/index.html b/resources/contents/es-ES/pages/index.html new file mode 100644 index 0000000000..5e2325cbed --- /dev/null +++ b/resources/contents/es-ES/pages/index.html @@ -0,0 +1,118 @@ + + + + + Git-it + + + + + + + + +
    +
    + +
    + Git-it +
    + +
    +
    + Retos realizados: + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +     + +
    + +
    +

    Bienvenido!

    +

    Git-it enseña lo básico para usar Git y GitHub. Estos no son meramente habilidades de Git y GitHub + para principiantes, son los pasos y comandos que usarás una y otra vez para tu increíble futuro creando código social + + control de versiones.

    + +
    +

    Pero espera, hay más!

    +

    Puedes hacer los retos de Git-it en Mandarín (Chino), Japonés, Coreano, Portugués (Brazil), Inglés (Estados Unidos), Español (Colombia), Español (España) y Ucraniano, + sólo selecciona el lenguaje que quieras desde el menú arriba a la izquierda.

    + +

    La opción 'Ventana' (window) en el menú de la aplicación te llevará a Diccionario, Recursos y la página Acerca de.

    +
    + + + + +
    + +
    + +

    ¡Ya has empezado!

    +

    Estás progresando, continúa donde lo dejaste.

    + + + +
    + +
    + +

    ¡Enhorabuena!

    +

    Terminaste los retos. Quiero empezar a escribir código socialmente, ¿qué más puedo hacer?

    + + + + +
    + +
    + + + diff --git a/resources/contents/es-ES/pages/resources.html b/resources/contents/es-ES/pages/resources.html new file mode 100644 index 0000000000..a5f0971674 --- /dev/null +++ b/resources/contents/es-ES/pages/resources.html @@ -0,0 +1,50 @@ +

    Recursos

    +

    Para reforzar lo que acabas de aprender or intentarlo de otra manera, acá tenemos sugerencias de otras guías y tutoriales.

    +

    Si estás listo para sumergirte en un proyecto, ve a la sección Proyectos para principiantes.

    + +
    +

    Tutorial interactivo

    +
      +
    • Intenta Git (Usa un emulador de la consola/terminal) por CodeSchool +
      • +
    + +

    Guías, libros y trucos

    + + +

    GitHub para escritorio (Desktop)

    +

    Probablemente instalaste esto antes de que comenzaras Git-it, pero si no lo hiciste, aquí está el enlace.

    +

    La aplicación de escritorio de GitHub te permite hace casi todo (no todo) lo que puedes hacer en la terminal/consola y es más fácil para + leer. Personalmente, la uso para revisar los cambios de código muy grandes diff que tengo. Tus cambios son + son más fáciles de visualizar de esta manera.

    + +
    + +

    Qué sigue?

    +
    +

    Ahora que te sientes más cómodo por que ya sabes lo fundamental, acá hay algunas ideas de proyectos para princiantes para + no desviarte del camino!

    + +
    diff --git a/resources/contents/es-ES/partials/chal-footer.html b/resources/contents/es-ES/partials/chal-footer.html new file mode 100644 index 0000000000..635e2fd4fd --- /dev/null +++ b/resources/contents/es-ES/partials/chal-footer.html @@ -0,0 +1,12 @@ +
    +
    + {{ prename }} +
    +     +
    +
    + {{ nextname }} +
    +     +
    +
    diff --git a/resources/contents/es-ES/partials/chal-header.html b/resources/contents/es-ES/partials/chal-header.html new file mode 100644 index 0000000000..3338b1ad6d --- /dev/null +++ b/resources/contents/es-ES/partials/chal-header.html @@ -0,0 +1,16 @@ + + + \ No newline at end of file diff --git a/resources/contents/es-ES/partials/chal-sidebar.html b/resources/contents/es-ES/partials/chal-sidebar.html new file mode 100644 index 0000000000..b140dfd948 --- /dev/null +++ b/resources/contents/es-ES/partials/chal-sidebar.html @@ -0,0 +1,15 @@ + diff --git a/resources/contents/es-ES/partials/footer.html b/resources/contents/es-ES/partials/footer.html new file mode 100644 index 0000000000..ec6bc0b2c9 --- /dev/null +++ b/resources/contents/es-ES/partials/footer.html @@ -0,0 +1,11 @@ + diff --git a/resources/contents/es-ES/partials/header.html b/resources/contents/es-ES/partials/header.html new file mode 100644 index 0000000000..31b907e85c --- /dev/null +++ b/resources/contents/es-ES/partials/header.html @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/resources/contents/es-ES/partials/verify-button.html b/resources/contents/es-ES/partials/verify-button.html new file mode 100644 index 0000000000..243fc70e42 --- /dev/null +++ b/resources/contents/es-ES/partials/verify-button.html @@ -0,0 +1,10 @@ +
    + +
    +
    +
    +
    +
      +
    + +
    diff --git a/resources/contents/es-ES/partials/verify-directory-button.html b/resources/contents/es-ES/partials/verify-directory-button.html new file mode 100644 index 0000000000..fba347d986 --- /dev/null +++ b/resources/contents/es-ES/partials/verify-directory-button.html @@ -0,0 +1,13 @@ +
    + + +
    +
    +
    +
    + Por favor, selecciona la carpeta en la que está tu repositorio. + +
      +
    + +
    diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000000..7034ead7c2 Binary files /dev/null and b/screenshot.png differ