summaryrefslogtreecommitdiffstatsabout
authorOmar BOURAS <obouras@exoplatform.com>2012-03-24 23:03:51 (GMT)
committer Omar BOURAS <obouras@exoplatform.com>2012-03-24 23:03:51 (GMT)
commita42657d70d1f664d245fb0405f866796f7d61559 (patch) (side-by-side diff)
tree83662957d55ce4357ff2c47851ff854fd4900b3d
parentc70e5b773b4c7a8b7d6f2f09f73756c5a7dc251f (diff)
parent6bcb2a7a4bbbabddec2486ffe4e10059a0477263 (diff)
downloadproject1-a42657d70d1f664d245fb0405f866796f7d61559.zip
project1-a42657d70d1f664d245fb0405f866796f7d61559.tar.gz
correction du conflit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--introduction.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/introduction.txt b/introduction.txt
index 9e29056..757bae8 100644
--- a/introduction.txt
+++ b/introduction.txt
@@ -1,3 +1,7 @@
+
Commencer par introduire du code
Changement dans le master
+
+changer quelque chose dans l'issue
+