rebase_testing_v2.view.lkml

view: rebase_testing_v2 {

## adding something on line 3 -shared branch

##. dimension: account_id {
##    sql: ${TABLE}.account_id ;;
##. }

## adding something on line9 via create_non_merge_commit
## adding something on line9 via non-conflicted-commit


}

## adding something