From 1cdc6fb1cf56fb44998b3509fa250403a872e8a9 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Thu, 7 Feb 2013 17:08:53 +0100 Subject: [PATCH] fixed a name problem --- .../blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md | 2 +- .../blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/html/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md b/content/html/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md index 088e654ea..e96e22d8d 100644 --- a/content/html/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md +++ b/content/html/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md @@ -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 diff --git a/content/html/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md b/content/html/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md index d30a157a4..4e0f3bc4d 100644 --- a/content/html/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md +++ b/content/html/fr/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure.md @@ -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