| commit | 3434d86a03804d5d4bcc1c071e822eb6d32301b0 | [log] [tgz] |
|---|---|---|
| author | Stanley Yang <yangstanley@google.com> | Thu Apr 01 22:30:11 2021 +0000 |
| committer | Stanley Yang <yangstanley@google.com> | Thu Apr 01 22:30:11 2021 +0000 |
| tree | a62cc69d3e26e2e4084de76cbf0fb9fc175d1be1 | |
| parent | 42d3ab2ad44c5d201ec3f4a2148f99db08b1fdfa [diff] |
adding account_id to trigger merge conflict on merge_conflict _branch Change-Id: I0cf70106ede5d994551e55b2021b75430f4d97cf
diff --git a/rebase_testing_v2.view.lkml b/rebase_testing_v2.view.lkml index 641f405..cbbf3ff 100644 --- a/rebase_testing_v2.view.lkml +++ b/rebase_testing_v2.view.lkml
@@ -2,4 +2,8 @@ ## adding something on line 3 -shared branch +##. dimension: account_id { +## sql: ${TABLE}.account_id ;; +##. } + }