adding more Change-Id: I3dbc15f69d32cfbaf4cb7e58809fef2300a77a11
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml index d84aa59..d9de477 100644 --- a/rebase_testing_v4.model.lkml +++ b/rebase_testing_v4.model.lkml
@@ -25,3 +25,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 + +## adding more