| commit | f248ee8737e63404e4debad21307a8067c7f2dea | [log] [tgz] |
|---|---|---|
| author | tierno <alfonso.tiernosepulveda@telefonica.com> | Mon Apr 22 14:44:27 2019 +0000 |
| committer | tierno <alfonso.tiernosepulveda@telefonica.com> | Tue Jun 09 14:56:18 2020 +0000 |
| tree | 8055627a0e79040d88afc95c4497c7c04e6af7d9 | |
| parent | f04fa0ebdc089fec08c964ba297d4e6f391b5e0c [diff] [blame] |
change over file2 Change-Id: I7b8f0dc7fa9f5475fd135f0e13cfcc1ee24a3c8a Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
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