From d613f6b05fda31293ecdc3b18688c44bf9fe6736 Mon Sep 17 00:00:00 2001
From: Rebecca Stambler <rstambler@golang.org>
Date: Tue, 27 Nov 2018 17:34:53 -0500
Subject: [PATCH] internal/suggest: fix tests by using a temporary directory

---
 internal/suggest/suggest_test.go | 2 +-
 server.go                        | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/internal/suggest/suggest_test.go b/internal/suggest/suggest_test.go
index 4b4c3ef5..ee20eada 100644
--- a/internal/suggest/suggest_test.go
+++ b/internal/suggest/suggest_test.go
@@ -87,7 +87,7 @@ func testRegress(t *testing.T, testDir string) {
 				return
 			}
 		} else if strings.HasSuffix(file.Name(), ".go.in") {
-			// Copy the test files to the temporary directory
+			// Copy the test files to the temporary directory and save information.
 			filename := filepath.Join(testDir, file.Name())
 			var err error
 			data, err = ioutil.ReadFile(filename)
diff --git a/server.go b/server.go
index 85b626fd..b0bde14e 100644
--- a/server.go
+++ b/server.go
@@ -3,11 +3,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-<<<<<<< HEAD
-=======
-	"go/build"
-	"go/importer"
->>>>>>> gocode: fix a bug with gbroot
 	"log"
 	"net"
 	"net/rpc"