# Conflicts: # public/app/plugins/datasource/stackdriver/partials/query.aggregation.html # public/app/plugins/datasource/stackdriver/partials/query.editor.html # public/app/plugins/datasource/stackdriver/partials/query.filter.html # public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts # public/app/plugins/datasource/stackdriver/query_ctrl.ts # public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts # public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
