git://git.onelab.eu / playground.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: b2133a5)
going on
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 28 Mar 2015 15:56:48 +0000 (16:56 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 28 Mar 2015 15:56:48 +0000 (16:56 +0100)
cleanup.txt patch | blob | history

diff --git a/cleanup.txt b/cleanup.txt
index abe69aa..c00363d 100644 (file)
--- a/cleanup.txt
+++ b/cleanup.txt
@@ -516,3 +516,4 @@ and here we add stuff instead
 
 and more
 
+after the merge we go on
playground