From ccb638ac7e2779a9973aedc9338387498d3fd529 Mon Sep 17 00:00:00 2001
From: ia <isaac.ardis@gmail.com>
Date: Tue, 27 Mar 2018 15:04:57 -0500
Subject: [PATCH] solution: fix typo

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 21a17c412..b7218c639 100644
--- 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