resolving merge confilct

test.view.lkml

diff --git a/test.view.lkml b/test.view.lkml
index f0c590f..cbefa9f 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -3,6 +3,4 @@
   #Paola's Changes Trying Again 09/28/2020
 
   ## Making changes after code review
-
-  ## Testing on 9/29/2020 3:52
 }