adding something on line 7 via Gerrit
Change-Id: Ic46fa9a74c58a96dfd62fc79361f3f7b1e54fd54

rebase_testing_v6.model.lkml

diff --git a/rebase_testing_v6.model.lkml b/rebase_testing_v6.model.lkml
index f9e803c..c79d07d 100644
--- a/rebase_testing_v6.model.lkml
+++ b/rebase_testing_v6.model.lkml
@@ -3,3 +3,5 @@
 ## overwritting something on other branch to create merge conflict
 
 ## adding a new line
+
+## adding something on line 7 via Gerrit