Fix unresolved merge conflicts (222ff160) · Commits · Sören Henning / theodolite · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

theodolite
- Activity
- Members
- Labels
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

222ff160

Commit 222ff160 authored 3 years ago by Sören Henning

Downloads
- Patches
- Plain Diff

Fix unresolved merge conflicts

parent ebe8fb40

No related branches found

No related tags found

1 merge request!217Use enums and duration in ExecutionStatus/BenchmarkStatus

Pipeline #6049 failed 3 years ago

Stage: build

Stage: test

Stage: check

Changes 2
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

theodolite/src/main/kotlin/theodolite/execution/operator/BenchmarkStateChecker.kt 15 additions, 15 deletions

...in/theodolite/execution/operator/BenchmarkStateChecker.kt
theodolite/src/test/kotlin/theodolite/execution/operator/BenchmarkStateCheckerTest.kt 2 additions, 2 deletions

...heodolite/execution/operator/BenchmarkStateCheckerTest.kt

with 17 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment