adding id - merge conflict
Change-Id: Id988d4b37232be7ab92fc60ca8608cdf80703bd0

rebase_testing_v2.view.lkml

diff --git a/rebase_testing_v2.view.lkml b/rebase_testing_v2.view.lkml
index 641f405..60b29ac 100644
--- a/rebase_testing_v2.view.lkml
+++ b/rebase_testing_v2.view.lkml
@@ -2,4 +2,8 @@
 
 ## adding something on line 3 -shared branch
 
+##. dimension: id {
+##    sql: ${TABLE}.id ;;
+##. }
+
 }