summaryrefslogtreecommitdiffstatsabout
authorClement Balay <cle.balay@gmail.com>2012-03-30 16:19:07 (GMT)
committer Clement Balay <cle.balay@gmail.com>2012-03-30 16:19:07 (GMT)
commitd34e18c30508b0388660efce900ef61753ca239e (patch) (side-by-side diff)
tree62e2d71dcd73bd77eac929437d769a5041ed48ff
parent6e13be6a7ff4367de19f587de3aa272c0a1e6064 (diff)
downloadproject1-d34e18c30508b0388660efce900ef61753ca239e.zip
project1-d34e18c30508b0388660efce900ef61753ca239e.tar.gz
totau
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--toto.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/toto.txt b/toto.txt
index e3db774..6ee7c23 100644
--- a/toto.txt
+++ b/toto.txt
@@ -1 +1 @@
-totau<<<<<<< .minetotu=======tota>>>>>>> .theirs \ No newline at end of file
+totau \ No newline at end of file