blob: 4dd261db1bb917e910c601c8dd17a3a68f2220ab [file] [log] [blame]
## 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 - shared branch
## new line at 6
## adding something on line 9 from a shared branch