testing
Change-Id: I4f7717627aef05c0fa5579a9ff14294575bd3149

test.view.lkml

diff --git a/test.view.lkml b/test.view.lkml
index b71de3d..962df8f 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -5,4 +5,7 @@
 
      # adding a merge conflict
 
+     ## Adding a new line
+     ## Adding another new line
+
 }