Test

2018-03-25 19:08:42 +03:00
parent 9f2994ad23
commit b49b22afd0
2 changed files with 0 additions and 8 deletions
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -4,12 +4,8 @@ SOURCES_PATH ?= $(BASEDIR)/sources
 BASE_CACHE ?= $(BASEDIR)/built
 SDK_PATH ?= $(BASEDIR)/SDKs
 NO_WALLET ?=
-<<<<<<< HEAD
 NO_UPNP ?=
 FALLBACK_DOWNLOAD_PATH ?= https://supernet/depends-sources
-=======
-PRIORITY_DOWNLOAD_PATH ?= https://z.cash/depends-sources
->>>>>>> zcash/master

 BUILD ?= $(shell ./config.guess)
 HOST ?= $(BUILD)