From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 28 Mar 2015 15:56:48 +0000 (+0100)
Subject: going on
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=43879c3ffbe9949c712a4b5fd9d940c777b3acaa;p=playground.git

going on
---

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