Fix integration tests

2015-04-28 00:09:44 +01:00
parent f5211b0697
commit 50d377d9fe
3 changed files with 5 additions and 2 deletions
--- a/test/conflict_test.go
+++ b/test/conflict_test.go
@@ -12,9 +12,10 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"path/filepath"
 	"testing"
 	"time"
+
+	"github.com/syncthing/syncthing/internal/osutil"
 )

 func TestConflict(t *testing.T) {