adding something on line 17 Change-Id: I48fd4991e45ea6465af9ad97de95e51499023719
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