adding something to line 15 Change-Id: I9fcbc254430b4c246ecab0e2c36e3bcfca2302fa Change-Id: Id7a1a09c5810499cad38ab3a9638ac178ede4e19
diff --git a/rebase_testing_v5.model.lkml b/rebase_testing_v5.model.lkml index f316b28..03035cb 100644 --- a/rebase_testing_v5.model.lkml +++ b/rebase_testing_v5.model.lkml
@@ -13,3 +13,5 @@ ## please add anything below this line ## adding something different to line 15 to crete merge conflict on branch-4 + +## adding something on line 17