| commit | b87e4104883c35fd1f8df4ed74508fadc3628814 | [log] [tgz] |
|---|---|---|
| author | L4C-Repo Testing <l4c-repo-testing@abc.com> | Mon Apr 19 16:18:49 2021 +0000 |
| committer | L4C-Repo Testing <l4c-repo-testing@abc.com> | Mon Apr 19 16:18:49 2021 +0000 |
| tree | 428196e4d0d099a2726b1f1e334867ca38656f4c | |
| parent | f7b514ef10691d4eb36b4b4d081c4096e1c1b01d [diff] |
adding a different thing on line 27 and merge it first to create merge conflict Change-Id: I6f4fe962ef1469e34626966018b58f9820303217
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml index 5501cfd..d84aa59 100644 --- a/rebase_testing_v4.model.lkml +++ b/rebase_testing_v4.model.lkml
@@ -23,3 +23,5 @@ ## Adding something on model file via non-conflicted-commit-v1 + +## adding a different thing on line 27 and merge it first to create merge conflict