yogsototh/scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed a name problem

Browse source
This commit is contained in:
Yann Esposito (Yogsototh) 2013-02-07 17:08:53 +01:00
parent 7dc3d67b46
commit 1cdc6fb1cf
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
content/html/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md
View file

@ -69,7 +69,7 @@ $ git pull
remote: Counting objects: 5, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /home/e640846/tmp/conflictTest
From /home/yogsototh/tmp/conflictTest
d3ea395..2dc7ffb master -> origin/master
Auto-merging foo
CONFLICT (content): Merge conflict in foo

2
content/html/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md
View file

@ -66,7 +66,7 @@ $ git pull
remote: Counting objects: 5, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /home/e640846/tmp/conflictTest
From /home/yogsototh/tmp/conflictTest
d3ea395..2dc7ffb master -> origin/master
Auto-merging foo
CONFLICT (content): Merge conflict in foo