gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update copy and resolve merge conflict

Browse Source
This commit is contained in:
Quincy Larson
2016-02-09 15:49:35 -08:00
parent 8b14acea16 5b2bd1c5b5
commit 4fe49642ef
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
challenges/00-getting-started/getting-started.json
View File

@ -187,7 +187,7 @@
[ [
"http://i.imgur.com/pYk0wOk.gif", "http://i.imgur.com/pYk0wOk.gif",
"A gif showing how you can star a GitHub repo.", "A gif showing how you can star a GitHub repo.",
"Go to Free Code Camp's open-source repository and \"star\" it. \"Starring\" is the GitHub equivalent of \"liking\" something.", "Open Free Code Camp's open-source repository. This is where our volunteer team collaborates on building Free Code Camp. You can \"star\" our repository. \"Starring\" is the GitHub equivalent of \"liking\" something.",
"https://github.com/freecodecamp/freecodecamp" "https://github.com/freecodecamp/freecodecamp"
], ],
[ [
@ -249,6 +249,7 @@
"http://i.imgur.com/pYk0wOk.gif", "http://i.imgur.com/pYk0wOk.gif",
"Un gif mostrándote como puedes dar una estrella a un repositorio de GitHub.", "Un gif mostrándote como puedes dar una estrella a un repositorio de GitHub.",
"Ve al repositorio de código libre de Free Code Camp y dale una \"estrella\". Las \"estrellas\" son el equivalente en GitHub de los \"me gusta\".", "Ve al repositorio de código libre de Free Code Camp y dale una \"estrella\". Las \"estrellas\" son el equivalente en GitHub de los \"me gusta\".",
"Si quieres, ve al repositorio de código libre de Free Code Camp y dale una \"estrella\". Las \"estrellas\" son el equivalente en GitHub de los \"me gusta\".",
"https://github.com/freecodecamp/freecodecamp" "https://github.com/freecodecamp/freecodecamp"
], ],
[ [