commit 59329642a217edef2841e624739263d870cba6ca
author L4C-Repo Testing <l4c-repo-testing@abc.com> Mon Apr 19 16:17:28 2021 +0000
committer L4C-Repo Testing <l4c-repo-testing@abc.com> Mon Apr 19 16:17:28 2021 +0000
tree 5b89b4f9084f21e39564b354561ff1dd93798d74
parent f7b514ef10691d4eb36b4b4d081c4096e1c1b01d

adding something on line 27 and it will be overwritten in different branch to create merge conflicted
Change-Id: I5d5ec6e6016992f82686a404bbef4702a0758bfc

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index 5501cfd..ba13c50 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 something on line 27 and it will be oeverwritten in different branch to create merge conflicted