Adding something on model file via non-conflicted-commit-v1
Change-Id: I42f9ea86bb02caede11ae1ea06189409484ccb5e

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index a86680f..5501cfd 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -20,3 +20,6 @@
 
 
 ## adding something
+
+
+## Adding something on model file via non-conflicted-commit-v1