LinuxSuRen
diff --git a/‎console/atest-ui/package.json‎
Lines changed: 1 addition & 0 deletions b/‎console/atest-ui/package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎pkg/runner/monitor/monitor.pb.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/runner/monitor/monitor.pb.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/runner/monitor/monitor_grpc.pb.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/runner/monitor/monitor_grpc.pb.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/server/remote_server.go‎
Lines changed: 1 addition & 0 deletions b/‎pkg/server/remote_server.go‎
Lines changed: 1 addition & 0 deletions
@@ -16,6 +16,7 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@vueuse/core": "^10.11.0",
     "codemirror": "^5.65.17",
     "diff-match-patch": "^1.0.5",
     "element-plus": "^2.3.7",
 
@@ -548,6 +548,7 @@ func (s *server) GetHistoryTestCase(ctx context.Context, in *HistoryTestCase) (r
 	return
 }
 
+<<<<<<< HEAD
 var ExecutionCountNum = promauto.NewCounter(prometheus.CounterOpts{
 	Name: "atest_execution_count",
 	Help: "The total number of request execution",
Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,7 @@ func (s server) GetHistoryTestCase(ctx context.Context, in HistoryTestCase) (r`
`548`	`548`	`return`
`549`	`549`	`}`
`550`	`550`
	`551`	`+<<<<<<< HEAD`
`551`	`552`	`var ExecutionCountNum = promauto.NewCounter(prometheus.CounterOpts{`
`552`	`553`	`Name: "atest_execution_count",`
`553`	`554`	`Help: "The total number of request execution",`