Fix merge conflict errors

PostHog · Feb 11, 2025 · a2e2e27 · a2e2e27
1 parent 0d7f1cc
commit a2e2e27
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/frontend/src/queries/schema/schema-general.ts b/frontend/src/queries/schema/schema-general.ts
@@ -104,6 +104,7 @@ export enum NodeKind {
     ExperimentEventMetricConfig = 'ExperimentEventMetricConfig',
     ExperimentDataWarehouseMetricConfig = 'ExperimentDataWarehouseMetricConfig',
     ExperimentTrendsQuery = 'ExperimentTrendsQuery',
+    ExperimentFunnelsQuery = 'ExperimentFunnelsQuery',
 
     // Database metadata
     DatabaseSchemaQuery = 'DatabaseSchemaQuery',
@@ -1823,15 +1824,6 @@ export interface ExperimentDataWarehouseMetricConfig {
     math_property?: string
 }
 
-export interface ExperimentMetric {
-    kind: 'ExperimentMetric'
-    name?: string
-    metric_type: ExperimentMetricType
-    filterTestAccounts?: boolean
-    inverse?: boolean
-    metric_config: ExperimentEventMetricConfig | ExperimentDataWarehouseMetricConfig
-}
-
 export interface ExperimentQuery extends DataNode<ExperimentTrendsQueryResponse> {
     kind: NodeKind.ExperimentQuery
     metric: ExperimentMetric