resolving merge conflicts
diff --git a/test.view.lkml b/test.view.lkml
index b123fef..a47c2fc 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -1,18 +1,3 @@
view: test {
- #Paola Gerrit Test 100000
- #Paola Gerrit Test 200000
- #Paola Gerrit Test 300000
- #Paola Gerrit Test 400000
- # Testing
- #Mohamed Gerrit Test 400000
- #Mohamed Gerrit Test 50000
- #Mohamed Gerrit Test 60
+ #Paola's Latest Changes 09/28/2020
}
-
-#additional testing with CID
-#additional testing with CID2
-
-#testing with change ID2
-
-
-## Testing with Rex