Merge branch 'master' of https://partner-code.googlesource.com/data-looker-lookml into dev-stanley-yang-8xqf
Change-Id: I8fcd7a577201f53dc3709e8ae07b5002aa072192
diff --git a/test.view.lkml b/test.view.lkml
index 6ff594d..64a2316 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -1,15 +1,12 @@
view: test {
- #Paola's Latest Changes 09/28/2020
- #Paola's Changes Trying Again 09/28/2020
- #
- #
- # adsad
- # new
- ## Making changes after code review
- # a
- # b
- # c
- # d
- # e
- # f
+
+ ## Hello team, you are awesome!!
+ ## Paola is awesome since she is reviewing my CL
+
+ # adding a merge conflict
+
+ ## Adding a new line
+ ## Adding another new line
+
+ ## adding new line
}
