Index: trunk/cursus.txt
===================================================================
diff -u -r138 -r147
--- trunk/cursus.txt	(.../cursus.txt)	(revision 138)
+++ trunk/cursus.txt	(.../cursus.txt)	(revision 147)
@@ -8,3 +8,7 @@
 A
 
 B
+
+
+
+Merge !!!
\ No newline at end of file