amending Change-Id: I2d9710f7da0ba960cc87cc09672e2ea7f40d6e69
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml index 20274f1..27ff6eb 100644 --- a/rebase_testing_v4.model.lkml +++ b/rebase_testing_v4.model.lkml
@@ -32,7 +32,6 @@ ## adding something on line33 - ## adding something different on line 35 to create merge conflict ## adding something on line35