1st commit Change-Id: I6ddeacc7bb2b3902877269052047deae771cd992 Change-Id: Ic3b18f791cf3b88c2505d49e996aa4b70cb9e6a1
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml index fa0a720..3b52c8f 100644 --- a/rebase_testing_v4.model.lkml +++ b/rebase_testing_v4.model.lkml
@@ -17,3 +17,5 @@ ### submitting something to create merge conflict ### submitting something to create merge conflict ### submitting something to create merge conflict + +### commit-something-for-testing-non-conflicted-commit