| commit | 646daef11b4a7c388d0263228a026edecf316d29 | [log] [tgz] |
|---|---|---|
| author | Stanley Yang <yangstanley@google.com> | Fri Apr 09 17:41:11 2021 +0000 |
| committer | Stanley Yang <yangstanley@google.com> | Fri Apr 09 17:41:11 2021 +0000 |
| tree | 2aad6450deb412398310872f7bd26d2311f355a2 | |
| parent | 9a13e8da00fa197d960719842d40276990a81b47 [diff] |
adding something line 4 via new-branch_123 ==> Should be no merge conflict Change-Id: I6b3bfb3181a3991d336bcea9c674aad114c5e54a
diff --git a/new_view.view.lkml b/new_view.view.lkml index 6d90434..570df13 100644 --- a/new_view.view.lkml +++ b/new_view.view.lkml
@@ -1,5 +1,6 @@ view: new_view { ## Adding something on line 3 - This is a new view +## adding something line 4 via new-branch_123 ==> Should be no merge conflict }