resolved conflicts

Signed-off-by: Eric Wei <[email protected]>
opensearch-project · May 17, 2022 · e179606 · e179606
1 parent f46c297
commit e179606
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/dashboards-observability/.cypress/utils/app_constants.js b/dashboards-observability/.cypress/utils/app_constants.js
@@ -81,18 +81,9 @@ export const service_two = 'payment';
 export const trace_one = 'HTTP POST';
 export const trace_two = 'HTTP GET';
 export const trace_three = 'client_pay_order';
-<<<<<<< HEAD
-export const spanQueryOnePartOne = 'where DestCityName ';
-export const spanQueryOnePartTwo = '= "Venice" | stats count() by span( timestamp ';
-export const spanQueryOnePartThree = ', 6h )';
-export const spanQueryTwoPartOne = 'where OriginCityName ';
-export const spanQueryTwoPartTwo = '= "Seoul" | stats count() by span( timestamp ';
-export const spanQueryTwoPartThree = ', 6h )';
-=======
 export const query_one = 'where DestCityName = "Venice" | stats count() by span( timestamp , 6h )';
 export const query_two = 'where OriginCityName = "Seoul" | stats count() by span( timestamp , 6h )';
 export const availability_default = 'stats count() by span( timestamp, 1h )';
->>>>>>> 9c2a8fbf (Add availability entry points (#731))
 export const visOneName = 'Flights to Venice';
 export const visTwoName = 'Flights from Seoul';
 export const composition = 'order, payment, HTTP POST, HTTP GET, client_pay_order'