blob: ba13c5025bcc470b980cc4d106ff3a8ec752193e [file] [log] [blame] [edit]
connection: "l4c_testing"
## adding rebase_testing_v4.model on line 3
## adding rebase_testing_v4.model on line 5
## adding rebase_testing_v4.model on line 7
## abc
## judah adding something on line 12
## L4C-Repo Testing v2 adding something on line 13
### submitting something to create merge conflict
### submitting something to create merge conflict
### submitting something to create merge conflict
### submitting something to create merge conflict
### submitting something to create merge conflict
## adding something
## Adding something on model file via non-conflicted-commit-v1
## adding something on line 27 and it will be oeverwritten in different branch to create merge conflicted