mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 23:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

PR #178 Awesome french translation fixup

Browse source
This commit is contained in:
Peter Cottle 2014-06-04 18:37:05 -07:00
parent c8dbcadb81
commit 20c833763a
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/advanced/multipleParents.js
View file

@ -221,7 +221,7 @@ exports.level = {
"(*Dans notre vue, Le premier parent se situe juste au dessus du merge.*)"
],
"afterMarkdowns": [
"Facile -- C\est ce que nous faisons toujours.."
"Facile -- C\'est ce que nous faisons toujours.."
],
"command": "git checkout master^",
"beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2"