adding a new line merge conflict 1
Change-Id: I98231b1811225d8e71e460f45aab6f18288d1bb2

project_b_all_plugins.view.lkml

diff --git a/project_b_all_plugins.view.lkml b/project_b_all_plugins.view.lkml
index f8686c5..e57983c 100644
--- a/project_b_all_plugins.view.lkml
+++ b/project_b_all_plugins.view.lkml
@@ -1,3 +1,4 @@
+## adding a new line ==> merge conflict
 ## Adding a new line
 ## lc4_testing Repo, project B only