Gitiles
Code Review Sign In
osm.etsi.org / test / refs/heads/master / . / file2.txt
blob: 9c36491379cf401b31d2203122bf02f321d50525 [file] [log] [blame]
tiernof248ee82019-04-22 14:44:27 +0000[diff] [blame]1<<<<<<< e73427bfbfa58797dc64a37c36a6cc025482eb38
2Second file :-)
3>>>>>>> my changes on master
garciadeblasd0677372017-06-21 17:52:36 +0200[diff] [blame]4With a new line
tiernof248ee82019-04-22 14:44:27 +0000[diff] [blame]5other line
6
7other line