blob: 93c79999d9ed98c874ffe77ac004ea580fef2d52 [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 ## adding a new line - shared branch
## new line at 6
## adding something on line 9 from a shared branch