From 5d1c674ea818ea534476ed0ca5436e0b513f86a4 Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Sun, 18 Jun 2017 12:50:46 +0200 Subject: fix merge commit --- storage/filesystem/internal/dotgit/dotgit_test.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'storage/filesystem') diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index e3a3c00..6151c8f 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -445,11 +445,7 @@ func (s *SuiteDotGit) TestObject(c *C) { file, err := dir.Object(hash) c.Assert(err, IsNil) c.Assert(strings.HasSuffix( -<<<<<<< HEAD file.Name(), fs.Join("objects", "03", "db8e1fbe133a480f2867aac478fd866686d69e")), -======= - file.Filename(), fs.Join("objects", "03", "db8e1fbe133a480f2867aac478fd866686d69e")), ->>>>>>> 86f6ba1dea8972df7c017e01ddb2c097892bc220 Equals, true, ) } -- cgit