fixing merge conflict
diff --git a/test.view.lkml b/test.view.lkml
index fc1255d..039234f 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -1,2 +1,34 @@
view: test {
+
+ #Changes
+ # Hello
+
+ # # You can specify the table name if it's different from the view name:
+ # sql_table_name: my_schema_name.tester ;;
+ #
+ # # Define your dimensions and measures here, like this:
+ # dimension: user_id {
+ # description: "Unique ID for each user that has ordered"
+ # type: number
+ # sql: ${TABLE}.user_id ;;
+ # }
+ #
+ # dimension: lifetime_orders {
+ # description: "The total number of orders for each user"
+ # type: number
+ # sql: ${TABLE}.lifetime_orders ;;
+ # }
+ #
+ # dimension_group: most_recent_purchase {
+ # description: "The date when each user last ordered"
+ # type: time
+ # timeframes: [date, week, month, year]
+ # sql: ${TABLE}.most_recent_purchase_at ;;
+ # }
+ #
+ # measure: total_lifetime_orders {
+ # description: "Use this for counting lifetime orders across many users"
+ # type: sum
+ # sql: ${lifetime_orders} ;;
+ # }
}
