| commit | b7a6e4c71d2d77d4cad99f6304715b97d39d8630 | [log] [tgz] |
|---|---|---|
| author | Stanley Yang <yangstanley@google.com> | Mon Mar 08 07:05:32 2021 +0000 |
| committer | Stanley Yang <yangstanley@google.com> | Mon Mar 08 07:05:32 2021 +0000 |
| tree | 3b0c08d975d8c49b174e33ccd0b3252ae60af2eb | |
| parent | 6466c105cc36c5c9fba67eb2ebcfc8e377beb55d [diff] |
adding a new line merge conflict 1 Change-Id: I98231b1811225d8e71e460f45aab6f18288d1bb2
diff --git a/project_b_all_plugins.view.lkml b/project_b_all_plugins.view.lkml index f8686c5..e57983c 100644 --- a/project_b_all_plugins.view.lkml +++ b/project_b_all_plugins.view.lkml
@@ -1,3 +1,4 @@ +## adding a new line ==> merge conflict ## Adding a new line ## lc4_testing Repo, project B only