Index: branches/Peter/cursus.txt
===================================================================
diff -u -r143 -r150
--- branches/Peter/cursus.txt	(.../cursus.txt)	(revision 143)
+++ branches/Peter/cursus.txt	(.../cursus.txt)	(revision 150)
@@ -8,3 +8,7 @@
 A
 
 B
+
+
+
+Merge !!!
\ No newline at end of file