commit 21228df23a8211789ba4fb6dd0d3b85be9601119
author Stanley Yang <yangstanley@google.com> Thu Apr 22 22:30:38 2021 +0000
committer Stanley Yang <yangstanley@google.com> Thu Apr 22 22:30:38 2021 +0000
tree 86a6f123b433f113d567825d938cf0a60728abc0
parent 223190f7cb6f9dedf93743cfd390987c1b2892ae

adding line for 501 error - put something random to create merge conflict
Change-Id: I1e9341204bd23ce00c0bce05919c3838003bae50

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index 183293e..54edbad 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -35,3 +35,6 @@
 ## adding something different on line 35 to create merge conflict
 
 ## [Line37]
+
+## ## adding line for 501 error - put something random to create merge conflict
+## adding more line to increase complexity