| commit | 3e5cb0c1bf671edd37b90c8c866a87b9888747ba | [log] [tgz] |
|---|---|---|
| author | L4C-Repo Testing V2 <l4c@testing.com> | Tue Apr 20 01:08:28 2021 +0000 |
| committer | L4C-Repo Testing V2 <l4c@testing.com> | Tue Apr 20 04:00:06 2021 +0000 |
| tree | 6f7ae8e76e7ff4ee4b3a5f7aa47bfe5a5442888b | |
| parent | 4992429c84292eeba59dd1ba42fe48aac83aabab [diff] |
overwritting something on other branch to create merge conflict
diff --git a/rebase_testing_v6.model.lkml b/rebase_testing_v6.model.lkml index 94706c4..29af7d9 100644 --- a/rebase_testing_v6.model.lkml +++ b/rebase_testing_v6.model.lkml
@@ -1 +1,3 @@ connection: "l4c_testing" + +## overwritting something on other branch to create merge conflict