adding something on line9 via non-conflicted-commit
Change-Id: I2d6854cabfebe8525d3caf5ddf9d88c4f2df0b28

rebase_testing_v2.view.lkml

diff --git a/rebase_testing_v2.view.lkml b/rebase_testing_v2.view.lkml
index 7b2aa6d..e0afbd9 100644
--- a/rebase_testing_v2.view.lkml
+++ b/rebase_testing_v2.view.lkml
@@ -7,5 +7,7 @@
 ##. }
 
 ## adding something on line9 via create_non_merge_commit
+## adding something on line9 via non-conflicted-commit
+
 
 }