Please add [line37] before adding anything to line37 Change-Id: I78ecbf88ff2dae6e58f7b1fd7fd71be523acbb7a
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml index ca62554..183293e 100644 --- a/rebase_testing_v4.model.lkml +++ b/rebase_testing_v4.model.lkml
@@ -33,3 +33,5 @@ ## adding something on line33 ## adding something different on line 35 to create merge conflict + +## [Line37]