rancher/kcrypt
1
0
Fork 0
mirror of https://github.com/kairos-io/kcrypt.git synced 2025-04-28 03:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove something left from the merge conflict

Browse Source 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Mauro Morales 2023-03-30 09:06:11 +02:00
parent 7e6a31f38b
commit a254871c22
No known key found for this signature in database
GPG Key ID: 0069994DD7392198
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/config/config_test.go
View File

@ -124,7 +124,6 @@ kcrypt:
})
It("replaces the file contents", func() {
<<<<<<< HEAD
err := c.SetMapping("COS_PERSISTENT:the_new_name:the_new_uuid")
Expect(err).ToNot(HaveOccurred())
err = c.WriteMappings(tmpFile.Name())