solution: fix typo

ethereumproject · Mar 27, 2018 · ccb638a · ccb638a
1 parent 8f8fcc6
commit ccb638a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -39,7 +39,6 @@ install:
   - go env
   - go get golang.org/x/sys/windows
 build_script:
-<<<<<<< HEAD
   - go test -tags="sputnikvm deterministic" ./...
   - schroedinger.exe -t 5 -f .\schroedinger-tests.txt
   - go build -tags=sputnikvm -ldflags "-X main.Version=%VERSION%" github.com/ethereumproject/go-ethereum/cmd/geth