X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=file2.txt;h=9c36491379cf401b31d2203122bf02f321d50525;hb=f248ee8737e63404e4debad21307a8067c7f2dea;hp=c317270b9ac3ec09aa6518056e1be1e7c1a00709;hpb=2164aa2dfadd5f9734342a515f6e46cb97a7956d;p=test.git

diff --git a/file2.txt b/file2.txt
index c317270..9c36491 100644
--- a/file2.txt
+++ b/file2.txt
@@ -1,2 +1,7 @@
-Second file
+<<<<<<< e73427bfbfa58797dc64a37c36a6cc025482eb38
+Second file :-)
+>>>>>>> my changes on master
 With a new line
+other line
+
+other line