Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 2d0e0c9

Browse files
mdelapenyamdelapenya
committed
fix: resolve conflicts
1 parent fc6399b commit 2d0e0c9

1 file changed

Lines changed: 0 additions & 10 deletions

File tree

‎internal/utils/utils_test.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,7 @@ func TestBuildArtifactName(t *testing.T) {
311311
artifact = "elastic-agent"
312312
arch := "amd64"
313313
extension := "tar.gz"
314-
<<<<<<< HEAD
315-
fallbackVersion := "7.x-SNAPSHOT"
316314
expectedFileName := "elastic-agent-7.x-SNAPSHOT-docker-image-linux-amd64.tar.gz"
317-
=======
318-
expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-docker-image-linux-amd64.tar.gz"
319-
>>>>>>> 55156f1 (fix: use beat_version as fallback if it's provided (#1256))
320315

321316
artifactName := BuildArtifactName(artifact, version, OS, arch, extension, true)
322317
assert.Equal(t, expectedFileName, artifactName)
@@ -331,12 +326,7 @@ func TestBuildArtifactName(t *testing.T) {
331326
artifact = "elastic-agent"
332327
arch := "arm64"
333328
extension := "tar.gz"
334-
<<<<<<< HEAD
335-
fallbackVersion := "7.x-SNAPSHOT"
336329
expectedFileName := "elastic-agent-7.x-SNAPSHOT-docker-image-linux-arm64.tar.gz"
337-
=======
338-
expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-docker-image-linux-arm64.tar.gz"
339-
>>>>>>> 55156f1 (fix: use beat_version as fallback if it's provided (#1256))
340330

341331
artifactName := BuildArtifactName(artifact, version, OS, arch, extension, true)
342332
assert.Equal(t, expectedFileName, artifactName)

0 commit comments

Comments
 (0)