blob: f7acbb79578166ba36f82820c94a10d279a00f20 [file] [log] [blame] [edit]
## adding something to the first line to move everything 1 line down to see if it triggers a conflict
connection: "l4c_testing"
## Adding a new line
## adding a new line ## adding a new line - shared branch
## new line at 6
## adding something on line 9 from a shared branch
## adding something to check commit history
## adding something to check commit history v2