Fix merge conflict

cisco-open · Nov 19, 2024 · 2b68e57 · 2b68e57
1 parent e5aefe8
commit 2b68e57
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/internal/lock_test.go b/internal/lock_test.go
@@ -51,11 +51,7 @@ func TestLockManipulations(t *testing.T) {
 	port, server := test.HttpHandler(handler)
 	defer server.Close()
 	resource := fmt.Sprintf("http://localhost:%d/test2.html", port)
-<<<<<<< HEAD
-	err = lock.AddResource([]string{resource}, "sha512", []string{}, "")
-=======
 	err = lock.AddResource([]string{resource}, "sha512", []string{}, "", "cacheUri")
->>>>>>> 1dc3140 (Replace old project files with new ones)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, len(lock.conf.Resource))
 	err = lock.Save()